summaryrefslogtreecommitdiffstats
path: root/src/mergeresultwindow.cpp
diff options
context:
space:
mode:
authorAutomated System <[email protected]>2011-12-07 21:01:14 -0600
committerAutomated System <[email protected]>2011-12-07 21:01:14 -0600
commitb6e4d65c272eed16b317a7f8fed20d05b7bd8236 (patch)
tree16e7fdb1b604f30ac7b9cb7bbaeae90c34f438a6 /src/mergeresultwindow.cpp
parent31206cf847884fdffd9dbecab0a4c001512a61d8 (diff)
downloadkdiff3-b6e4d65c272eed16b317a7f8fed20d05b7bd8236.tar.gz
kdiff3-b6e4d65c272eed16b317a7f8fed20d05b7bd8236.zip
Reset submodule main/applications/kdiff3/admin to latest HEAD
Diffstat (limited to 'src/mergeresultwindow.cpp')
0 files changed, 0 insertions, 0 deletions