From: Tristan Van Berkom <tristan.van.berkom@gmail.com>
Date: Thu, 2 Dec 2010 04:58:02 +0000 (+0900)
Subject: Merge branch 'master' into treeview-refactor
X-Git-Url: http://pileus.org/git/?p=~andy%2Fgtk;a=commitdiff_plain;h=03a72118add37e6df51c12dba6c62298e810d41a

Merge branch 'master' into treeview-refactor

Conflicts:
	tests/Makefile.am
---

03a72118add37e6df51c12dba6c62298e810d41a
diff --cc tests/Makefile.am
index 78151044d,4d63c1106..283285311
--- a/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