Donald Alan Morrison 5075a83271 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 ... Conflicts: cocos2dx/kazmath/src/ray2.c		2012-08-25 00:00:27 -07:00
..
javascript	Fixed VS2010 Warning C4800: 'JSBool' : forcing value to bool 'true' or	2012-08-24 12:01:26 -07:00
lua	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-08-25 00:00:27 -07:00