summaryrefslogtreecommitdiffstats
path: root/src/merger.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-19 23:54:46 -0600
committerTimothy Pearson <[email protected]>2013-01-19 23:54:46 -0600
commitfe52f645fd58a8c0309a37360507c1b13361a348 (patch)
treed89a335f7e9331a367e66b388e2e29cbf40be159 /src/merger.cpp
parentc8fc7b9d459cfe043934f86dd3e0af7bf8ecccf7 (diff)
downloadkdiff3-fe52f645fd58a8c0309a37360507c1b13361a348.tar.gz
kdiff3-fe52f645fd58a8c0309a37360507c1b13361a348.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'src/merger.cpp')
0 files changed, 0 insertions, 0 deletions