James Chen 9ab671fb03 Merge pull request #3425 from dumganhar/iss2488-new-label-sample ... Iss2488: Merge PR https://github.com/cocos2d/cocos2d-x/pull/3422		2013-08-15 07:16:48 -07:00
..
Cpp	issue #2488: Updating makefile for linux and emscripten.	2013-08-15 21:44:51 +08:00
Javascript	issue #2521: Updating JS-Test.	2013-08-12 11:31:54 +08:00
Lua	Update nojava.txt with readme.	2013-08-07 12:29:58 -07:00
samples.xcodeproj	New Label tests plus bug fixing	2013-08-12 13:29:54 -07:00