summaryrefslogtreecommitdiff
path: root/distro
diff options
context:
space:
mode:
authorStefano Karapetsas <stefano@karapetsas.com>2012-06-16 11:31:39 +0200
committerStefano Karapetsas <stefano@karapetsas.com>2012-06-16 11:31:39 +0200
commitcbbe010884fe1e3ad1deabbed7f89a77b0098a2f (patch)
treeab8700d7ffef178d2e720710b2756fafa0ef6a7b /distro
parentdec2e9160bdc72ff9b44582d5484e673e60e27bb (diff)
downloadcaja-cbbe010884fe1e3ad1deabbed7f89a77b0098a2f.tar.bz2
caja-cbbe010884fe1e3ad1deabbed7f89a77b0098a2f.tar.xz
add diff button for text files in file conflict dialog
Diffstat (limited to 'distro')
0 files changed, 0 insertions, 0 deletions