diff options
author | Stefano Karapetsas <[email protected]> | 2013-10-06 18:13:53 +0200 |
---|---|---|
committer | Stefano Karapetsas <[email protected]> | 2013-10-06 18:13:53 +0200 |
commit | bf470188e81dc2d1e17cbd2b4df69868ba7e1c42 (patch) | |
tree | baaec17e9ad4485642148a29cab8f244c91c23f4 /src/caja-main.h | |
parent | bd7e0b8c49a423789495678fb65b519c707feed4 (diff) | |
parent | bcf9affe7ba72c62a5e15ce4a6a7aee99d94c47a (diff) | |
download | caja-bf470188e81dc2d1e17cbd2b4df69868ba7e1c42.tar.bz2 caja-bf470188e81dc2d1e17cbd2b4df69868ba7e1c42.tar.xz |
Merge branch '1.6' of github.com:mate-desktop/mate-file-manager into 1.6
Diffstat (limited to 'src/caja-main.h')
0 files changed, 0 insertions, 0 deletions