summaryrefslogtreecommitdiffstats
path: root/src/mergeresultwindow.cpp
diff options
context:
space:
mode:
authorAutomated System <[email protected]>2013-02-11 05:30:50 -0600
committerAutomated System <[email protected]>2013-02-11 05:30:50 -0600
commit1d9f3db1841239e26ac3dcb0c9b4075086870cb6 (patch)
tree92cf9660657d0be5e4b74c42a46d287f8c0ae18d /src/mergeresultwindow.cpp
parent64eaa62d202fd64fe08f77487e14c2ed9a4a01a3 (diff)
downloadkdiff3-1d9f3db1841239e26ac3dcb0c9b4075086870cb6.tar.gz
kdiff3-1d9f3db1841239e26ac3dcb0c9b4075086870cb6.zip
Reset submodule main/applications/kdiff3/admin to latest HEAD
Diffstat (limited to 'src/mergeresultwindow.cpp')
0 files changed, 0 insertions, 0 deletions