]> Pileus Git - ~andy/gtk/commitdiff
Merge branch 'master' into toolpalette
authorMatthias Clasen <mclasen@redhat.com>
Fri, 27 Nov 2009 04:54:55 +0000 (23:54 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Fri, 27 Nov 2009 04:54:55 +0000 (23:54 -0500)
1  2 
docs/reference/gtk/gtk-sections.txt
gtk/gtk.symbols
gtk/gtksettings.c
gtk/gtktoolbutton.c

Simple merge
diff --cc gtk/gtk.symbols
Simple merge
Simple merge
Simple merge