summaryrefslogtreecommitdiffstats
path: root/cervisia/tests/resolvedlg-conflict-test-01.txt
diff options
context:
space:
mode:
authorAutomated System <[email protected]>2013-02-16 02:30:30 -0600
committerAutomated System <[email protected]>2013-02-16 02:30:30 -0600
commit17578a4b7df3923578c1d502aa9865261d41b87d (patch)
tree90ac82f8887f5e4fd9af4d85bbf9059633a8d85d /cervisia/tests/resolvedlg-conflict-test-01.txt
parent5e82eb91b1f9be66273643d39dfa627ddf67242c (diff)
downloadtdesdk-17578a4b7df3923578c1d502aa9865261d41b87d.tar.gz
tdesdk-17578a4b7df3923578c1d502aa9865261d41b87d.zip
Reset submodule main/tdesdk/cmake to latest HEAD
Diffstat (limited to 'cervisia/tests/resolvedlg-conflict-test-01.txt')
0 files changed, 0 insertions, 0 deletions