Viewing all changes in revision 24.2.13.
- Committer: Renato Araujo Oliveira Filho
- Date: 2014-01-07 12:59:23 UTC
- mto: This revision was merged to the branch mainline in revision 26.
- Revision ID: renato.filho@canonical.com-20140107125923-jgrgfkchsufrtd04
Reverted wrong conflict solution.
- files modified:
- qorganizer/qorganizer-eds-engine.cpp
expand all
collapse all
added
removed
