no changes, just resolved a conflict

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 3d02255d6f1a48c176ced68f34eca24586f15fe0..da237db11fb395fa1ce4fb049a79c26d6e776771 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -873,6 +873,11 @@
  */
 #define wxUSE_ZIPSTREAM 0
 
+/*
+ * Use gzip streams, requires wxUSE_ZLIB
+ */
+#define wxUSE_GZSTREAM 0
+
 /*
  * wxPalette class
  */