Pileus Git - ~andy/gtk/commit

]> Pileus Git - ~andy/gtk/commit

projects / ~andy / gtk / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1d3961b cd76b05)

author	Tristan Van Berkom <tristan.van.berkom@gmail.com>
	Sat, 4 Dec 2010 15:36:37 +0000 (00:36 +0900)
committer	Tristan Van Berkom <tristan.van.berkom@gmail.com>
	Sat, 4 Dec 2010 15:36:37 +0000 (00:36 +0900)
commit	0d786985a368d88e8ab4e45fc3607efc5e773732
tree	5dfc8ec0e27ac3c23b9dc2eb097018971c28fd6b	tree \| snapshot
parent	1d3961b34258a7a8c97ca12993220554369fccb1	commit \| diff
parent	cd76b057e9693b6919f4ccbe40ce205efc8d3caf	commit \| diff

Merge branch 'master' into treeview-refactor

Conflicts:
gtk/gtkmarshalers.list
tests/Makefile.am

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/gtkcellrenderer.c	diff1 \|	diff2 \|	blob \| history
gtk/gtkmarshalers.list	diff1 \|	diff2 \|	blob \| history
tests/Makefile.am	diff1 \|	diff2 \|	blob \| history

Andy's GTK+ repository