]> Pileus Git - ~andy/gtk/commit
Merge branch 'master' into broadway2
authorAlexander Larsson <alexl@redhat.com>
Wed, 19 Jan 2011 18:52:00 +0000 (19:52 +0100)
committerAlexander Larsson <alexl@redhat.com>
Wed, 19 Jan 2011 18:52:00 +0000 (19:52 +0100)
commit920e8b434367f9aa8aab306721cc024e66892e2e
treedf38a80da6b3a1b015cbd872b914e6c75db0f13e
parent190f533258de3ff60062d24c5ba0d100343cd44a
parent0a5e8ce685ea2c41bf78bd059d2611f2355dceef
Merge branch 'master' into broadway2

Doesn't build, but fixed up actual conflicts

Conflicts:
configure.ac
gdk/Makefile.am
gtk/Makefile.am
configure.ac
gdk/Makefile.am