Menu
▾
▴
[Java-game-lib-cvs] CVS: LWJGL/src/native acinclude.m4,1.4,1.5 aclocal.m4,1.5,1.6
|
From: Elias N. <eli...@us...> - 2002-11-30 21:25:03
|
Update of /cvsroot/java-game-lib/LWJGL/src/native In directory sc8-pr-cvs1:/tmp/cvs-serv18783 Modified Files: acinclude.m4 aclocal.m4 Log Message: Added the XWarpointer call again - this time centering the pointer Index: acinclude.m4 CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/acinclude.m4 =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/acinclude.m4,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- acinclude.m4 30 Nov 2002 03:28:29 -0000 1.4 +++ acinclude.m4 30 Nov 2002 21:25:00 -0000 1.5 @@ -1,3 +1,28 @@ +# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- + +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +dnl aclocal.m4 generated automatically by aclocal 1.4-p5 + +dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without +dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A +dnl PARTICULAR PURPOSE. + dnl aclocal.m4 generated automatically by aclocal 1.4-p5 dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. @@ -3651,10 +3676,15 @@ # This is just to silence aclocal about the macro not being used ifelse([AC_DISABLE_FAST_INSTALL]) +<<<<<<< aclocal.m4 +======= + + +>>>>>>> 1.5 Index: aclocal.m4 CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/aclocal.m4 =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/aclocal.m4,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- aclocal.m4 30 Nov 2002 03:28:30 -0000 1.5 +++ aclocal.m4 30 Nov 2002 21:25:00 -0000 1.6 @@ -1,3 +1,29 @@ +# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- + +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- + +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + dnl aclocal.m4 generated automatically by aclocal 1.4-p5 dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. @@ -3663,11 +3689,16 @@ # This is just to silence aclocal about the macro not being used ifelse([AC_DISABLE_FAST_INSTALL]) +<<<<<<< aclocal.m4 +======= + + +>>>>>>> 1.5 |
