diff options
| author | Patrick Ohly <patrick.ohly@intel.com> | 2012-01-16 11:47:10 +0100 |
|---|---|---|
| committer | Patrick Ohly <patrick.ohly@intel.com> | 2012-01-16 11:47:10 +0100 |
| commit | f1bffbc1a4b178cb701e51ed1c6caadc71128e95 (patch) | |
| tree | 099e151072aef896a0b03394445c26791c085cad /README.rst | |
| parent | b240b6d4c4c21479c53da3d9d2cc6e836543845d (diff) | |
| parent | 09ce2bb579dc6d25e1efe9b6bc435f97c2ac322c (diff) | |
Merge commit 'syncevolution-1-2-2'
Conflicts:
Makefile.am
configure-post.in
configure.ac
src/Makefile-gen.am
src/dbus/qt/Makefile.am
src/syncevo-dbus-server.cpp
test/test-dbus.py
Conflicts caused by renaming of files on master. Manually applied the
relevant changes to the renamed files.
Diffstat (limited to 'README.rst')
| -rw-r--r-- | README.rst | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -686,11 +686,11 @@ defined, which is marked with the word `required`. Sync properties --------------- -<<insert sync-property>> +<< see "syncevolution --sync-property ?" >> Source properties ----------------- -<<insert source-property>> +<< see "syncevolution --source-property ?" >> EXAMPLES |