Nikolay Kasyanov defab0e4b5 Merge remote-tracking branch 'upstream/master' into osx_fix ...

Conflicts:
	CMakeLists.txt

2012-07-31 01:06:18 +04:00

..

mangle

Changed standard C lib includes to C++ format

2012-07-17 09:44:24 +02:00

openengine

Merge remote-tracking branch 'upstream/master' into osx_fix

2012-07-31 01:06:18 +04:00

platform

removed tabs

2012-03-02 14:18:10 +04:00