Per Inge Mathisen 3f8cecb841 Merge branch 'master' into qt ... Conflicts: configure.ac lib/ivis_opengl/Makefile.am lib/ivis_opengl/glew/glew.vcxproj lib/ivis_opengl/glew/glew.vcxproj.filters lib/ivis_opengl/piedraw.cpp lib/ivis_opengl/piemode.cpp lib/ivis_opengl/piestate.cpp lib/ivis_opengl/screen.cpp lib/ivis_opengl/tex.cpp lib/sequence/Makefile.am macosx/Warzone.xcodeproj/project.pbxproj macosx/configs/Glew-All.xcconfig macosx/configs/QuesoGLC-All.xcconfig macosx/configs/Warzone-All.xcconfig src/Makefile.am src/texture.cpp win32/libs/Makefile win32/libs/glew/Makefile win32/libs/glew/patches/glew_pkgconfig.diff		2011-04-25 00:51:13 +02:00
..
patches	Glew win32 cross compilation pkgconfig stuff.	2011-04-20 16:28:41 +02:00
Makefile	Glew win32 cross compilation pkgconfig stuff.	2011-04-20 16:28:41 +02:00