]> git.street.me.uk Git - andy/viking.git/commitdiff
Merge branch 'gobjectify-map-type' into gobject-builder
authorGuilhem Bonnefille <guilhem.bonnefille@gmail.com>
Fri, 24 Jul 2009 20:47:42 +0000 (22:47 +0200)
committerGuilhem Bonnefille <guilhem.bonnefille@gmail.com>
Fri, 24 Jul 2009 20:47:42 +0000 (22:47 +0200)
1  2 
src/Makefile.am

diff --cc src/Makefile.am
Simple merge