]> Pileus Git - ~andy/gtk/commit
Fixed wrongly resolved merge conflicts.
authorTim Janik <timj@src.gnome.org>
Fri, 20 Jun 2008 11:11:01 +0000 (11:11 +0000)
committerTim Janik <timj@src.gnome.org>
Fri, 20 Jun 2008 11:11:01 +0000 (11:11 +0000)
commitde676bf5944d41cf8522d078d0d6eec348c220e3
tree147aa8642d30a959f086412bc89aa89b46aa0a20
parent870b9c868c3b32e0a77590dfc3b4b00b3e7b1629
Fixed wrongly resolved merge conflicts.

* Fixed wrongly resolved merge conflicts.

svn path=/trunk/; revision=20633
gtk/gtk.symbols
gtk/gtkliststore.h
gtk/gtktreemodelsort.h
gtk/gtktreeselection.h
gtk/gtktreestore.h