2.4.0 Release Candiate 5

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@629 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/ChangeLog b/ChangeLog
index eded42e..b94431e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -998,7 +998,7 @@ mouse pointers don't work) on the way:
 (261) Fixed a cuboctahedron vertex, implemented wire mode for that shape.
 
 **************************************************************************
-* 8 May 2004 -- 2.4.0 Release Candidate 1 Released
+* 8 May 2005 -- 2.4.0 Release Candidate 1 Released
 **************************************************************************
 (262) Fixed the "vfprintf" for Windows so that error messages get printed
       out again
@@ -1006,13 +1006,13 @@ mouse pointers don't work) on the way:
 (263) Implemented Takeshi Nishimura's menu fixes.  Menus should work now.
 
 **************************************************************************
-* 15 May 2004 -- 2.4.0 Release Candidate 2 Released
+* 15 May 2005 -- 2.4.0 Release Candidate 2 Released
 **************************************************************************
 
 (264) More game mode fixes
 
 **************************************************************************
-* 19 May 2004 -- 2.4.0 Release Candidate 3 Released
+* 19 May 2005 -- 2.4.0 Release Candidate 3 Released
 **************************************************************************
 
 (265) Lowering minimum autoconf version required.
@@ -1035,6 +1035,11 @@ wrong.
 (269) Dan Torop's patch to fix joystick polling times (resolves bug 1206856)
 
 **************************************************************************
-* 25 May 2004 -- 2.4.0 Release Candidate 4 Released
+* 25 May 2005 -- 2.4.0 Release Candidate 4 Released
 **************************************************************************
 
+(270) Takeshi Nishimura's changes to make the Windows mouse wheel/button mapping match that of X11; also fixing a typo in the associated mouse callback argument list.
+
+**************************************************************************
+* 2 Jun 2005 -- 2.4.0 Release Candidate 5 Released
+**************************************************************************

diff --git a/configure.ac b/configure.ac
index 72d0f53..2131ed2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([freeglut library], [2.4.0-rc4], [freeglut-bugs@lists.sourceforge.net], [freeglut])
+AC_INIT([freeglut library], [2.4.0-rc5], [freeglut-bugs@lists.sourceforge.net], [freeglut])
 AM_INIT_AUTOMAKE
 AC_PREREQ([2.56])
 AC_CONFIG_SRCDIR([AUTHORS])

diff --git a/src/freeglut_internal.h b/src/freeglut_internal.h
index 9f18d04..10086ea 100644 (file)
--- a/src/freeglut_internal.h
+++ b/src/freeglut_internal.h
@@ -34,7 +34,7 @@
 
 /* XXX Update these for each release! */
 #define  VERSION_MAJOR 2
-#define  VERSION_MINOR 2
+#define  VERSION_MINOR 4
 #define  VERSION_PATCH 0
 
 /* Freeglut is meant to be available under all Unix/X11 and Win32 platforms. */