talons

commit 3ffc47f7a88e647f75064b7738d056b71deb9820
parent 8c759a1032bb331c39257366ede1ee3cfdac6d2a
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 12 Oct 2012 14:16:20 +0000

2012-10-12 [colin]	3.8.1cvs97

	* src/common/defs.h
		Drop include of internal glib header
		Patch by Werner Koch

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/common/defs.h
 | 
4
----

4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-12 [colin]	3.8.1cvs97
+
+	* src/common/defs.h
+		Drop include of internal glib header
+		Patch by Werner Koch
+
 2012-10-12 [colin]	3.8.1cvs96
 
 	* src/gtk/gtkcmctree.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4471,3 +4471,4 @@
 ( cvs diff -u -r 1.36.2.204 -r 1.36.2.205 src/common/utils.c;  ) > 3.8.1cvs94.patchset
 ( cvs diff -u -r 1.36.2.205 -r 1.36.2.206 src/common/utils.c;  ) > 3.8.1cvs95.patchset
 ( cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.4.64 -r 1.1.4.65 src/gtk/gtksctree.c;  ) > 3.8.1cvs96.patchset
+( cvs diff -u -r 1.9.2.60 -r 1.9.2.61 src/common/defs.h;  ) > 3.8.1cvs97.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=96
+EXTRA_VERSION=97
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/defs.h b/src/common/defs.h
@@ -26,10 +26,6 @@
 
 #include <glib.h>
 
-#ifdef G_OS_WIN32
-#  include <glib/gwin32.h>
-#endif
-
 #if HAVE_PATHS_H
 #  include <paths.h>
 #endif