commit 59eaf7e1684851e4857a211d653841bc128fa13e
Merge: ffca7ba c5f6dce
Author: Stephen Watson <stephen@kerofin.demon.co.uk>
Date:   Tue Sep 25 07:04:45 2012 +0100

    Merge branch 'master' of /home/stephen/src/rox-git/rox-filer/

commit c5f6dcec9808f61b469da38d6ae5dc963ad0a008
Merge: fb217eb 3374e73
Author: Stephen Watson <stephen@kerofin.demon.co.uk>
Date:   Tue Sep 25 06:57:50 2012 +0100

    Merge branch 'master' of git://repo.or.cz/rox-filer

commit 3374e731702628b63af683dfb7a696270d046bd5
Author: Norm Pierce <npierce.aq2w@dappermapper.com>
Date:   Sat Sep 22 12:21:38 2012 +0100

    Fixed xdgmime support for zero-length files

commit dce5f47900acdb9c198d425da97774cbdd06f304
Merge: 2e51424 18309e0
Author: Thomas Leonard <talex5@gmail.com>
Date:   Sat Sep 22 12:10:47 2012 +0100

    Updated to latest xdgmime library

commit 2e5142464dec77d4e7575dd648a0f219a991d6a7
Author: Norm Pierce <npierce.aq2w@dappermapper.com>
Date:   Sat Sep 22 11:53:32 2012 +0100

    Remove rule that zero-length files are always text/plain
    
    Let the xdgmime library decide.

commit 18309e0236c1a7f7bd6e35fdb0b06a2bd6b9da75
Author: Thomas Leonard <talex5@gmail.com>
Date:   Sat Sep 22 11:52:14 2012 +0100

    Removed xdgmime files not needed for ROX

commit 97f32448e491de3a824ce7e3723d3db9a80df12c
Author: Thomas Leonard <talex5@gmail.com>
Date:   Sat Sep 22 12:05:51 2012 +0100

    Fixed use-after-free in xdgmime

commit 2719214fb3e5c4e2e980f5057ee27a9f7a9d3d28
Merge: 4c295a7 2b5cb38
Author: Thomas Leonard <talex5@gmail.com>
Date:   Sat Sep 22 11:27:09 2012 +0100

    Added xdgmime history to ROX-Filer's Git repository

commit 4c295a77992410c97088eb8e162585a98a2d1f07
Author: Norm Pierce <npierce.aq2w@dappermapper.com>
Date:   Sun Aug 12 07:39:23 2012 +0100

    Fix pinboard event forwarding with GTK >= 2.18
    
    Some symptoms are the occasional need for extra clicks to launch an application
    or the inability to bring up the ROX-Filer menu without first left-clicking on
    the backdrop. This happens after using a window manager menu.
    
    For a full description, see:
    
      http://www.murga-linux.com/puppy/viewtopic.php?p=611819#611819

commit ac7912b9964ccda06c8d0d140c25ddadd65232af
Author: Thomas Leonard <talex5@gmail.com>
Date:   Sun Jul 15 07:28:11 2012 +0100

    Include -lm explicitly
    
    Error (reported in #3544149) was:
    
    /usr/bin/ld: view_collection.o: undefined reference to symbol 'sqrt@@GLIBC_2.0'
    /usr/bin/ld: note: 'sqrt@@GLIBC_2.0' is defined in DSO /lib/i386-linux-gnu/libm.so.6 so try adding it to the linker command line
    /lib/i386-linux-gnu/libm.so.6: could not read symbols: Invalid operation