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

lib/ivis_opengl/Makefile.am

@@ -6,23 +6,23 @@ noinst_LIBRARIES = libivis_opengl.a
 noinst_HEADERS = \
 	piematrix.h \
 	screen.h \
-        bitimage.h \
-        imd.h \
-        ivi.h \
-        ivisdef.h \
-        jpeg_encoder.h \
-        pieblitfunc.h \
-        pieclip.h \
-        piedef.h \
-        piefunc.h \
-        piemode.h \
-        piepalette.h \
-        piestate.h \
-        pietypes.h \
-        png_util.h \
-        rendmode.h \
-        tex.h \
-        textdraw.h
+	bitimage.h \
+	imd.h \
+	ivi.h \
+	ivisdef.h \
+	jpeg_encoder.h \
+	pieblitfunc.h \
+	pieclip.h \
+	piedef.h \
+	piefunc.h \
+	piemode.h \
+	piepalette.h \
+	piestate.h \
+	pietypes.h \
+	png_util.h \
+	rendmode.h \
+	tex.h \
+	textdraw.h
 
 libivis_opengl_a_SOURCES = \
 	ivi.cpp \
@@ -37,11 +37,11 @@ libivis_opengl_a_SOURCES = \
 	screen.cpp \
 	tex.cpp \
 	textdraw.cpp \
-        bitimage.cpp \
-        imd.cpp \
-        imdload.cpp \
-        jpeg_encoder.cpp \
-        pieclip.cpp \
-        png_util.cpp
+	bitimage.cpp \
+	imd.cpp \
+	imdload.cpp \
+	jpeg_encoder.cpp \
+	pieclip.cpp \
+	png_util.cpp
 
 libivis_opengl_a_LIBADD = $(top_builddir)/lib/framework/libframework.a

lib/ivis_opengl/piedraw.cpp

@@ -20,9 +20,11 @@
 /** \file
  *  Render routines for 3D coloured and shaded transparency rendering.
  */
+
+#include <string.h>
+
 #include "lib/framework/frame.h"
 #include "lib/framework/opengl.h"
-
 #include "lib/ivis_opengl/ivisdef.h"
 #include "lib/ivis_opengl/imd.h"
 #include "lib/ivis_opengl/piefunc.h"

lib/ivis_opengl/piemode.cpp

@@ -26,7 +26,6 @@
  */
 /***************************************************************************/
 
-
 #include "lib/framework/frame.h"
 #include "lib/framework/opengl.h"
 #include "lib/framework/wzapp_c.h"

lib/netplay/miniupnpc/Changelog.txt

@@ -1,6 +1,89 @@
-$Id: Changelog.txt,v 1.95 2009/10/30 09:18:18 nanard Exp $
+$Id: Changelog.txt,v 1.125 2010/12/21 16:13:13 nanard Exp $
 miniUPnP client Changelog.
 
+2010/12/21:
+  use NO_GETADDRINFO macro to disable the use of getaddrinfo/freeaddrinfo
+
+2010/12/11:
+  Improvements on getHTTPResponse() code.
+
+2010/12/09:
+  new code for miniwget that handle Chunked transfer encoding
+  using getHTTPResponse() in SOAP call code
+  Adding MANIFEST.in for 'python setup.py bdist_rpm'
+
+2010/11/25:
+  changes to minissdpc.c to compile under Win32.
+  see http://miniupnp.tuxfamily.org/forum/viewtopic.php?t=729
+
+2010/09/17:
+  Various improvement to Makefile from Michał Górny
+
+2010/08/05:
+  Adding the script "external-ip.sh" from Reuben Hawkins
+
+2010/06/09:
+  update to python module to match modification made on 2010/04/05
+  update to Java test code to match modification made on 2010/04/05
+  all UPNP_* function now return an error if the SOAP request failed
+  at HTTP level.
+
+2010/04/17:
+  Using GetBestRoute() under win32 in order to find the
+  right interface to use.
+
+2010/04/12:
+  Retrying with HTTP/1.1 if HTTP/1.0 failed. see
+  http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=1703
+
+2010/04/07:
+  avoid returning duplicates in upnpDiscover()
+
+2010/04/05:
+  Create a connecthostport.h/.c with connecthostport() function
+  and use it in miniwget and miniupnpc.
+  Use getnameinfo() instead of inet_ntop or inet_ntoa
+  Work to make miniupnpc IPV6 compatible...
+  Add java test code.
+  Big changes in order to support device having both WANIPConnection
+  and WANPPPConnection.
+
+2010/04/04:
+  Use getaddrinfo() instead of gethostbyname() in miniwget.
+
+2010/01/06:
+  #define _DARWIN_C_SOURCE for Mac OS X
+
+2009/12/19:
+  Improve MinGW32 build
+
+2009/12/11:
+  adding a MSVC9 project to build the static library and executable
+
+2009/12/10:
+  Fixing some compilation stuff for Windows/MinGW
+
+2009/12/07:
+  adaptations in Makefile and updateminiupnpcstring.sh for AmigaOS
+  some fixes for Windows when using virtual ethernet adapters (it is the
+  case with VMWare installed).
+
+2009/12/04:
+  some fixes for AmigaOS compilation
+  Changed HTTP version to HTTP/1.0 for Soap too (to prevent chunked
+  transfer encoding)
+
+2009/12/03:
+  updating printIDG and testigddescparse.c for debug.
+  modifications to compile under AmigaOS
+  adding a testminiwget program
+  Changed miniwget to advertise itself as HTTP/1.0 to prevent chunked
+  transfer encoding
+
+2009/11/26:
+  fixing updateminiupnpcstrings.sh to take into account
+  which command that does not return an error code.
+
 VERSION 1.4 : released 2009/10/30
 
 2009/10/16:

lib/netplay/miniupnpc/LICENCE → lib/netplay/miniupnpc/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2008, Thomas BERNARD 
+Copyright (c) 2005-2009, Thomas BERNARD 
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

lib/netplay/miniupnpc/Makefile.am

@@ -1,31 +1,36 @@
 AM_CPPFLAGS = -DSTATICLIB $(SDL_CFLAGS) $(WZ_CPPFLAGS)
-AM_CFLAGS = -DSTATICLIB $(WZ_CFLAGS)
+AM_CFLAGS = -DSTATICLIB $(WZ_CFLAGS) -UDEBUG
 
 noinst_LIBRARIES = libminiupnpc.a
 noinst_HEADERS = \
+	bsdqueue.h \
+	codelength.h \
+	connecthostport.h \
+	declspec.h \
+	igd_desc_parse.h \
+	minisoap.h \
+	minissdpc.h \
 	miniupnpc.h \
 	miniupnpcstrings.h \
 	miniwget.h \
 	minixml.h \
-	minisoap.h \
-	minissdpc.h \
-	codelength.h \
 	upnpcommands.h \
-	igd_desc_parse.h \
-	upnpreplyparse.h \
 	upnperrors.h \
-	declspec.h \
-	bsdqueue.h
+	upnpreplyparse.h
 
 libminiupnpc_a_SOURCES = \
-	miniwget.c \
-	minixml.c \
+	connecthostport.c \
 	igd_desc_parse.c \
 	minisoap.c \
+	minissdpc.c \
 	miniupnpc.c \
-	upnpreplyparse.c \
+	miniwget.c \
+	minixml.c \
 	upnpcommands.c \
-	minissdpc.c \
-	upnperrors.c
+	upnperrors.c \
+	upnpreplyparse.c
 
-EXTRA_DIST = LICENCE README
+EXTRA_DIST = \
+	Changelog.txt \
+	LICENSE \
+	README