Merge branch 'master' of git://repo.or.cz/rox-filer/ma
tree096e176468a429a7c8edbbe182ec9b8932b42cb6
drwxr-xr-x - Choices
-rw-r--r-- 2980 README
-rw-r--r-- 3247 README-es
-rw-r--r-- 761 ROX-Filer.xml
drwxr-xr-x - ROX-Filer
-rwxr-xr-x 5816 install.sh
-rw-r--r-- 186 rox.xml