diff options
| author | Stefano Karapetsas <[email protected]> | 2012-12-03 14:20:22 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-12-03 14:20:22 -0800 |
| commit | a7aa069036f960a37cc6149ecdceab917dffa7a0 (patch) | |
| tree | b47b0816e8ed67229eb5c5fb6de5b2178889ed12 /libcaja-private/caja-file-conflict-dialog.c | |
| parent | 12908bcb598233adabd7492d92efdda3d2cbc47c (diff) | |
| parent | 2665b684fda835cfa6a485b6e2c8c0a98190facb (diff) | |
| download | caja-a7aa069036f960a37cc6149ecdceab917dffa7a0.tar.bz2 caja-a7aa069036f960a37cc6149ecdceab917dffa7a0.tar.xz | |
Merge pull request #63 from jasmineaura/develop
Bring Caja up to speed, stage2
Diffstat (limited to 'libcaja-private/caja-file-conflict-dialog.c')
0 files changed, 0 insertions, 0 deletions