Branch: refs/heads/qt
Home: https://github.com/Warzone2100/warzone2100
Commit: 3f8cecb8419ac61715d0475030bff3dc8936114e
https://github.com/Warzone2100/warzone2100/commit/3f8cecb8419ac61715d0475030bff3dc8936114e
Author: Per Inge Mathisen <[email protected]>
Date: 2011-04-24 (Sun, 24 Apr 2011)
Changed paths:
M lib/ivis_opengl/Makefile.am
M lib/ivis_opengl/piedraw.cpp
M lib/ivis_opengl/piemode.cpp
M lib/netplay/miniupnpc/Changelog.txt
R lib/netplay/miniupnpc/LICENCE
A lib/netplay/miniupnpc/LICENSE
M lib/netplay/miniupnpc/Makefile.am
R lib/netplay/miniupnpc/Makefile.mingw
R lib/netplay/miniupnpc/Makefile.old
M lib/netplay/miniupnpc/README
A lib/netplay/miniupnpc/connecthostport.c
A lib/netplay/miniupnpc/connecthostport.h
M lib/netplay/miniupnpc/declspec.h
M lib/netplay/miniupnpc/igd_desc_parse.c
M lib/netplay/miniupnpc/igd_desc_parse.h
R lib/netplay/miniupnpc/man3/miniupnpc.3
R lib/netplay/miniupnpc/mingw32make.bat
M lib/netplay/miniupnpc/minisoap.c
M lib/netplay/miniupnpc/minisoap.h
M lib/netplay/miniupnpc/minissdpc.c
M lib/netplay/miniupnpc/miniupnpc.c
R lib/netplay/miniupnpc/miniupnpc.def
M lib/netplay/miniupnpc/miniupnpc.h
R lib/netplay/miniupnpc/miniupnpcmodule.c
M lib/netplay/miniupnpc/miniupnpcstrings.h
R lib/netplay/miniupnpc/miniupnpcstrings.h.in
M lib/netplay/miniupnpc/miniwget.c
M lib/netplay/miniupnpc/miniwget.h
R lib/netplay/miniupnpc/minixmlvalid.c
R lib/netplay/miniupnpc/pymoduletest.py
R lib/netplay/miniupnpc/setup.py
R lib/netplay/miniupnpc/setupmingw32.py
R lib/netplay/miniupnpc/testigddescparse.c
R lib/netplay/miniupnpc/testminixml.c
R lib/netplay/miniupnpc/testupnpigd.py
R lib/netplay/miniupnpc/testupnpreplyparse.c
R lib/netplay/miniupnpc/updateminiupnpcstrings.sh
R lib/netplay/miniupnpc/upnpc.c
M lib/netplay/miniupnpc/upnpcommands.c
M lib/netplay/miniupnpc/upnpcommands.h
M lib/netplay/netplay.cpp
M macosx/BuildBot/01_configure.sh
M macosx/configs/Project-All.xcconfig
M macosx/configs/Warzone-Debug.xcconfig
M macosx/configs/Warzone-Release.xcconfig
M pkg/nsis/warzone2100.nsi
M po/de.po
M src/display3d.cpp
M src/terrain.cpp
M win32/libs/glew/Makefile
M win32/libs/quesoglc/Makefile
M win32/libs/quesoglc/patches/glew_h_include_stdint_h.diff
Log Message:
-----------
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
------------------------------------------------------------------------------
Fulfilling the Lean Software Promise
Lean software platforms are now widely adopted and the benefits have been
demonstrated beyond question. Learn why your peers are replacing JEE
containers with lightweight application servers - and what you can gain
from the move. http://p.sf.net/sfu/vmware-sfemails
_______________________________________________
Warzone2100-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
