Elderme b359e8f9fd Merged with master, solved conflicts

2016-06-18 19:28:54 +02:00

..

angelscript

Merged with master, solved conflicts

2016-06-18 19:28:54 +02:00

bullet

Merged with master, solved conflicts

2016-06-18 19:28:54 +02:00

enet

Merged with master, solved conflicts

2016-06-18 19:28:54 +02:00

glew

Merged with master, solved conflicts

2016-06-18 19:28:54 +02:00

irrlicht

Merged with master, solved conflicts

2016-06-18 19:28:54 +02:00

jpeglib

Merged with master, solved conflicts

2016-06-18 19:28:54 +02:00

libpng

Merged with master, solved conflicts

2016-06-18 19:28:54 +02:00

wiiuse

Merged with master, solved conflicts

2016-06-18 19:28:54 +02:00

zlib

Fixed osx compilation (hopefully).

2015-01-28 11:04:40 +11:00