summaryrefslogtreecommitdiffstats
path: root/doc/en/dothemerge.html
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-08-30 01:36:00 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-08-30 01:36:00 +0200
commit6b734218e2765019caf6659e1ffefd0050d12800 (patch)
treec62964008024973859cbc8ffb5a24b1e361cd8d6 /doc/en/dothemerge.html
parent465bccf5c9787fb46757c22aca2bd12c0292e03a (diff)
downloadkdiff3-6b734218e2765019caf6659e1ffefd0050d12800.tar.gz
kdiff3-6b734218e2765019caf6659e1ffefd0050d12800.zip
Reset submodule main/applications/kdiff3/admin to latest HEAD
Diffstat (limited to 'doc/en/dothemerge.html')
0 files changed, 0 insertions, 0 deletions