Léo Terziman 2071b4fb2f Merge commit 'ca7542cf5d11ccde33e18365889343088bad9582' into contrib ...

Conflicts:
	CMakeLists.txt
	contrib/zlib/CMakeLists.txt
	contrib/zlib/zconf.h.included

2014-01-17 11:30:33 +01:00

..

clipper

- update clipper to v4.8.8

2012-10-17 00:41:29 +00:00

ConvertUTF

[2972343] LightWave/modo patch. See http://sourceforge.net/tracker/index.php?func=detail&aid=2972343&group_id=226462&atid=1067634

2010-03-18 17:20:49 +00:00

cppunit-1.12.1

[3393728] [PATCH 1/2] ommit->omit and splitted->split

2011-08-20 22:00:33 +00:00

irrXML

- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.

2012-02-03 03:38:30 +00:00

poly2tri

Fix Android compilation with STLport

2013-08-20 20:02:07 -07:00

unzip

# when compiling with MSVC's C compiler, (void)param won't be accepted, omit it at all to avoid trouble.

2011-06-09 14:43:28 +00:00

zlib

Merge commit 'ca7542cf5d11ccde33e18365889343088bad9582' into contrib

2014-01-17 11:30:33 +01:00

cppunit_note.txt

General

2009-03-05 22:32:13 +00:00

irrXML_note.txt

Added support for compressed x files (all files from dx sdk, except car2.x, work, no further tests yet).

2009-01-18 23:48:25 +00:00

poly2tri_patch.txt

# poly2tri: add missing <stdexcept>

2012-01-17 01:37:46 +00:00

zlib_note.txt

General

2009-03-05 22:32:13 +00:00