Merge branch 'master' into treeview-refactor

author Tristan Van Berkom <tristan.van.berkom@gmail.com>

Thu, 2 Dec 2010 04:58:02 +0000 (13:58 +0900)

committer Tristan Van Berkom <tristan.van.berkom@gmail.com>

Thu, 2 Dec 2010 04:58:02 +0000 (13:58 +0900)
author Tristan Van Berkom <tristan.van.berkom@gmail.com>
Thu, 2 Dec 2010 04:58:02 +0000 (13:58 +0900)
committer Tristan Van Berkom <tristan.van.berkom@gmail.com>
Thu, 2 Dec 2010 04:58:02 +0000 (13:58 +0900)
diff --cc gtk/Makefile.am
Simple merge
diff --cc gtk/gtk.h
Simple merge
diff --cc gtk/gtkcellrenderer.c
Simple merge
diff --cc gtk/gtkcellrenderertext.c
Simple merge
diff --cc tests/Makefile.am

index 78151044d7a9bce2721c4758fd8da95985b049a3,4d63c1106551fe414555029c13de92f60dbb7cb5..283285311b5f9a0c2edb765c88dcaa4ab8981fba
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -96,7 -98,7 +98,8 @@@ noinst_PROGRAMS =  $(TEST_PROGS)      
         testexpander                    \
         testvolumebutton                \
         testscrolledwindow              \
-       testcellarea
++      testcellarea                    \
+       testswitch
   
   if USE_X11
   noinst_PROGRAMS += testerrors
author	Tristan Van Berkom <tristan.van.berkom@gmail.com>
	Thu, 2 Dec 2010 04:58:02 +0000 (13:58 +0900)
committer	Tristan Van Berkom <tristan.van.berkom@gmail.com>
	Thu, 2 Dec 2010 04:58:02 +0000 (13:58 +0900)
		1	2
gtk/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
gtk/gtk.h	patch \|	diff1 \|	diff2 \|	blob \| history
gtk/gtkcellrenderer.c	patch \|	diff1 \|	diff2 \|	blob \| history
gtk/gtkcellrenderertext.c	patch \|	diff1 \|	diff2 \|	blob \| history
tests/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history