Hopefully removed all damage done by commits without merge
authorSven Panne <sven.panne@aedion.de>
Wed, 5 Jan 2005 14:28:22 +0000 (14:28 +0000)
committerSven Panne <sven.panne@aedion.de>
Wed, 5 Jan 2005 14:28:22 +0000 (14:28 +0000)
commitfe9c7405acbc1f305a01f7e123e6c70070934ae8
tree47512ad09398ed82acc8fd43a6f864629a71113a
parentba21dbc1eca4d994466497da8a309ce1300e775f
Hopefully removed all damage done by commits without merge

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@561 7f0cb862-5218-0410-a997-914c9d46530a
src/freeglut_ext.c
src/freeglut_font.c
src/freeglut_main.c
src/freeglut_state.c
src/freeglut_window.c