diff options
| author | Stefano Karapetsas <[email protected]> | 2012-06-16 11:31:39 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-06-16 11:31:39 +0200 |
| commit | cbbe010884fe1e3ad1deabbed7f89a77b0098a2f (patch) | |
| tree | ab8700d7ffef178d2e720710b2756fafa0ef6a7b /cut-n-paste-code/Makefile.am | |
| parent | dec2e9160bdc72ff9b44582d5484e673e60e27bb (diff) | |
| download | caja-cbbe010884fe1e3ad1deabbed7f89a77b0098a2f.tar.bz2 caja-cbbe010884fe1e3ad1deabbed7f89a77b0098a2f.tar.xz | |
add diff button for text files in file conflict dialog
Diffstat (limited to 'cut-n-paste-code/Makefile.am')
0 files changed, 0 insertions, 0 deletions