Pileus Git - ~andy/gtk/commit

]> Pileus Git - ~andy/gtk/commit

projects / ~andy / gtk / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c08bf93 1a385c5)

author	Alexander Larsson <alexl@redhat.com>
	Wed, 17 Jun 2009 10:56:05 +0000 (12:56 +0200)
committer	Alexander Larsson <alexl@redhat.com>
	Wed, 17 Jun 2009 10:56:05 +0000 (12:56 +0200)
commit	7303f3c9fdc2fcb75907a3fd81cc4a44446931a7
tree	7607ea832b4c8ddb1f61240b7ca43299f9f67e6e	tree \| snapshot
parent	c08bf93fe5fd0f7192aec9ad0358da246c211e0f	commit \| diff
parent	1a385c50f041cdcc8ee88b27af85094901c2b05d	commit \| diff

Merge branch 'master' into client-side-windows

This updates client-side-windows to the the latest soname
change for easier testing.

Conflicts:
gdk/x11/gdkwindow-x11.c
tests/Makefile.am

gdk/x11/gdkdisplay-x11.c	diff1 \|	diff2 \|	blob \| history
gdk/x11/gdkproperty-x11.c	diff1 \|	diff2 \|	blob \| history
gdk/x11/gdkwindow-x11.c	diff1 \|	diff2 \|	blob \| history
gtk/gtkcombobox.c	diff1 \|	diff2 \|	blob \| history
tests/Makefile.am	diff1 \|	diff2 \|	blob \| history

Andy's GTK+ repository