callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed wrongly resolved merge conflicts.

Browse Source 
* Fixed wrongly resolved merge conflicts.

svn path=/trunk/; revision=20633
This commit is contained in:
Tim Janik
2008-06-20 11:11:01 +00:00
parent 870b9c868c
commit de676bf594
5 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtktreestore.h
View File

@ -57,7 +57,7 @@ struct _GtkTreeStore
GType *GSEAL (column_headers);
GtkTreeIterCompareFunc GSEAL (default_sort_func);
gpointer GSEAL (default_sort_data);
GtkDestroyNotify GSEAL (default_sort_destroy);
GDestroyNotify GSEAL (default_sort_destroy);
guint GSEAL (columns_dirty) : 1;
};