compilation fix after incorrectly resolved conflict

[wxWidgets.git] / include / wx / version.h

diff --git a/include/wx/version.h b/include/wx/version.h
index 62606f98c7e283915e2b55231b25f8dfaf325243..66db0313116037625cee554fffafd72f10228074 100644 (file)
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -15,11 +15,11 @@
 /* Bump-up with each new version */
 #define wxMAJOR_VERSION    2
 #define wxMINOR_VERSION    1
-#define wxRELEASE_NUMBER   0
-#define wxVERSION_STRING "wxWindows 2.1.0"
+#define wxRELEASE_NUMBER   12
+#define wxVERSION_STRING "wxWindows 2.1.12"
 #define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER
-#define wxBETA_NUMBER      2
+#define wxBETA_NUMBER      0
 #define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0)
 
 #endif
-       // _WX_VERSIONH__
+// _WX_VERSIONH__