Pileus Git - ~andy/gtk/commit

]> Pileus Git - ~andy/gtk/commit

projects / ~andy / gtk / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5f942b1 9223245)

author	Cosimo Cecchi <cosimoc@gnome.org>
	Tue, 30 Nov 2010 15:27:28 +0000 (16:27 +0100)
committer	Cosimo Cecchi <cosimoc@gnome.org>
	Tue, 30 Nov 2010 15:27:28 +0000 (16:27 +0100)
commit	cb916f274673322bb6bfe6ac7256d3526a15cbfa
tree	84024c4a3a59902ccb8247b7b62ca1231fde66ed	tree \| snapshot
parent	5f942b123248712f86fe7bfc3724b899a2bc0844	commit \| diff
parent	922324553be10f847d4bdc3a177e641887a2921d	commit \| diff

Merge branch 'master' into open-with-dialog

Conflicts:
docs/reference/gtk/gtk3-sections.txt
gtk/gtk.symbols

configure.ac	diff1 \|	diff2 \|	blob \| history
docs/reference/gtk/gtk-docs.sgml	diff1 \|	diff2 \|	blob \| history
docs/reference/gtk/gtk3-sections.txt	diff1 \|	diff2 \|	blob \| history
docs/reference/gtk/gtk3.types	diff1 \|	diff2 \|	blob \| history
gtk/Makefile.am	diff1 \|	diff2 \|	blob \| history
gtk/gtk.h	diff1 \|	diff2 \|	blob \| history
gtk/gtk.symbols	diff1 \|	diff2 \|	blob \| history
gtk/gtkenums.h	diff1 \|	diff2 \|	blob \| history
tests/Makefile.am	diff1 \|	diff2 \|	blob \| history

Andy's GTK+ repository