]> Pileus Git - ~andy/gtk/commit
Merge branch 'master' into treeview-refactor
authorTristan Van Berkom <tristan.van.berkom@gmail.com>
Thu, 2 Dec 2010 04:58:02 +0000 (13:58 +0900)
committerTristan Van Berkom <tristan.van.berkom@gmail.com>
Thu, 2 Dec 2010 04:58:02 +0000 (13:58 +0900)
commit03a72118add37e6df51c12dba6c62298e810d41a
tree200a88ad09d55a5e0a207d0f7275de146e8b337c
parenta9fd00a4358f0ff73280bfeb51164872aea50e9b
parentdd678ac323b81e67bb1dea488f2123efee7e3500
Merge branch 'master' into treeview-refactor

Conflicts:
tests/Makefile.am
gtk/Makefile.am
gtk/gtk.h
gtk/gtkcellrenderer.c
gtk/gtkcellrenderertext.c
tests/Makefile.am