| commit | bbc68dcadd53c5ead4d29fe43488e2f4345dd52c | |
| author | Stephen Watson <stephen@kerofin.demon.co.uk> | |
| Mon, 17 Mar 2008 09:26:01 +0000 (17 09:26 +0000) | ||
| committer | Stephen Watson <stephen@kerofin.demon.co.uk> | |
| Mon, 17 Mar 2008 09:26:01 +0000 (17 09:26 +0000) | ||
| tree | 3ff2331332803bbf7ef4eb7ad0d134c5259629aa | treesnapshot (tar.gz zip) |
| parent | fd53b890416f720c36c6030e64e83c30625e91e7 | commitdiff |
| parent | 21d9eaca6011a6992e1327dacecabd3f3ffd5cb3 | commitdiff |
Merge branch 'master' of git://repo.or.cz/rox-filer
Conflicts:
ROX-Filer/ROX/MIME/application-x-core.png
ROX-Filer/ROX/MIME/inode-core.png
ROX-Filer/ROX/MIME/mime-inode:core.png
nothing to commit
Conflicts:
ROX-Filer/ROX/MIME/application-x-core.png
ROX-Filer/ROX/MIME/inode-core.png
ROX-Filer/ROX/MIME/mime-inode:core.png
nothing to commit