log easyhg-merge-osx.sh @ 234:482802b6d306

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