summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--gtk/gtk.symbols1
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index dca71c12f9..851f5b4ffe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-10-11 Tor Lillqvist <tml@novell.com>
+ * gtk/gtk.symbols: Remove gtk_combo_string_key, which is a static
+ variable.
+
+2006-10-11 Tor Lillqvist <tml@novell.com>
+
Merge from 2.10 branch:
* gtk/gtkmain.c (do_pre_parse_initialization): On Win32, if
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index da17fe5e98..d4ea310837 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -4707,7 +4707,6 @@ gtk_interface_age
gtk_major_version
gtk_minor_version
gtk_micro_version
-gtk_combo_string_key
gtk_debug_flags
gtk_text_attr_appearance_type
gtk_text_char_type