summaryrefslogtreecommitdiff
path: root/libcaja-private/caja-file-conflict-dialog.c
AgeCommit message (Expand)AuthorFilesLines
2012-08-12Fixed incorrect fsf addresses. Closes #28.Steve Zesch1-2/+2
2012-06-16add diff button for text files in file conflict dialogStefano Karapetsas1-0/+67
2011-12-01moving from https://github.com/perberos/mate-desktop-environmentPerberos1-0/+670