commit 57836f4b2061b390fec25b2aa08e48eaab92e73c Merge: 941a45e... 53d3012... Author: Stephen Watson Date: Sun Sep 20 07:06:42 2009 +0100 Merge branch 'master' of /home/stephen/src/rox-git/rox-filer/ commit 53d3012e7ffd3e08f468c8e3d4a4cc24b0e5309c Merge: 75f2092... f5f79b8... Author: Stephen Watson Date: Sat Sep 19 16:31:58 2009 +0100 Merge branch 'master' of git://repo.or.cz/rox-filer commit f5f79b848ebf5738c979f75e5e780e7779d82a6a Author: Luis Felipe Abad Date: Tue Sep 15 20:10:03 2009 +0100 Updated Spanish translation. commit 9d43dd7539844e209b22f6bbad7cf1cfb6629034 Author: Thomas Leonard Date: Tue Sep 8 14:48:03 2009 +0100 Mark French manual as up-to-date Requested by Arnaud Calvo. commit 941a45ebd9cfa8b7455ef5ba9ec3be76c3b38ffd Merge: 1f7f6af... 75f2092... Author: Stephen Watson Date: Sun Aug 23 07:04:55 2009 +0100 Merge branch 'master' of /home/stephen/src/rox-git/rox-filer/ commit 75f2092efe820a64b1df85e2c82079baedfc7d68 Author: Stephen Watson Date: Sat Aug 22 12:57:30 2009 +0100 Turn the error on invalid line breaks in uri_list_to_glist into a warning. Firefox 3.5 upto and including 3.5.2 gets it wrong, but we don't want to stop drops working until they fix it. commit 1f7f6af868cb4842e8325eda37fc7c953d134a32 Merge: 9b2e552... ce34c54... Author: Stephen Watson Date: Mon Jul 20 07:05:48 2009 +0100 Merge branch 'master' of /home/stephen/src/rox-git/rox-filer/ commit ce34c54e1426901ed61ac4ddf8c095aebe183384 Author: Stephen Watson Date: Sun Jul 19 12:53:10 2009 +0100 Before starting to generate a thumbnail, check if it is currently being generated (like it was before pixmap_try_thumb() was added). commit 9b2e55290c80598971af3a3914b7d73042504ed9 Merge: d6a4dca... 38fb7fa... Author: Stephen Watson Date: Sun Jul 19 07:05:32 2009 +0100 Merge branch 'master' of /home/stephen/src/rox-git/rox-filer/ commit 38fb7facf41e527c6ea8cd4a42869b54927243f0 Merge: 281e1ce... 5da5bc3... Author: Stephen Watson Date: Sat Jul 18 16:30:51 2009 +0100 Merge branch 'master' of git://repo.or.cz/rox-filer