Updated TortoiseMerge docs from TortoiseSVN source
commitf4561387731f3d264cc94e1d693b7cb9b682ed39
authorSven Strickroth <email@cs-ware.de>
Sun, 30 Dec 2012 22:51:01 +0000 (30 23:51 +0100)
committerSven Strickroth <email@cs-ware.de>
Sun, 30 Dec 2012 23:37:36 +0000 (31 00:37 +0100)
treec8d95340d1f25fb5af0d30b11ab4d20df925c4dc
parentdfe827ebcae9c70a81bc69b3913af301fa8dc23e
Updated TortoiseMerge docs from TortoiseSVN source

Signed-off-by: Sven Strickroth <email@cs-ware.de>
20 files changed:
doc/images/en/TMerge_OnePane.png
doc/images/en/TMerge_PatchWindow.png
doc/images/en/TMerge_SettingsColors.png
doc/images/en/TMerge_SettingsGeneral.png
doc/images/en/TMerge_ThreePane.png
doc/images/en/TMerge_Toolbar.png
doc/images/en/TMerge_TwoPane.png
doc/source/en/TortoiseMerge/tme_app_automation.xml
doc/source/en/TortoiseMerge/tme_app_shortcuts.xml
doc/source/en/TortoiseMerge/tme_basics.xml
doc/source/en/TortoiseMerge/tme_dug.xml
doc/source/en/TortoiseMerge/tme_dug_conflicts.xml
doc/source/en/TortoiseMerge/tme_dug_controls.xml
doc/source/en/TortoiseMerge/tme_dug_icons.xml
doc/source/en/TortoiseMerge/tme_dug_open.xml
doc/source/en/TortoiseMerge/tme_dug_settings.xml
doc/source/en/TortoiseMerge/tme_dug_views.xml
doc/source/en/TortoiseMerge/tme_introduction.xml
doc/source/en/TortoiseMerge/tme_preface.xml
doc/source/en/TortoiseMerge/tortoisemerge.xml