3 Commits (f77e27ca19cf455ecd8b7a16e7f96478a3ef13a7)

Author	SHA1	Message	Date
Kim Kulling	54ac680400	fix merge conflict.	2016-01-06 22:19:07 +01:00
Kim Kulling	6bfdeb6a12	sprintf replacement: introduce au_snprintf to support snprintf for v2013 ... and earier ( closes https://github.com/assimp/assimp/issues/743 )	2016-01-06 15:35:25 +01:00
Kim Kulling	e88fcb27bf	update: update zlib to version 1.2.8 ( see https://github.com/assimp/assimp/issues/134 ) ... Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>	2013-10-14 19:27:40 +02:00