log

age author description
Wed, 23 Nov 2011 17:03:43 +0000 Chris Cannam Start work on merge topic
Wed, 23 Nov 2011 11:24:23 +0000 Chris Cannam Add more useful message for merge with working directory ancestor
Thu, 17 Nov 2011 17:49:05 +0000 Chris Cannam New icon for OS/X; bump version number