log easyhg-merge-osx.sh @ 255:12df2232e40a

age author description
Wed, 05 Jan 2011 15:58:34 +0000 Chris Cannam * OS/X: Add icon (not sure this is working though)