chuanweizhang2013 337bc2f2e8 Merge pull request #22 from cocos2d/develop ... update cocos2d-x		2014-04-11 09:33:04 +08:00
..
frameworks	issue #4729: Compilation error fixes for linux	2014-04-10 00:36:42 +08:00
res	build lua.a for arm64bit and iOS simulator 64 bit architectures, change .ma3 files to .caf files.	2014-03-15 01:19:06 +08:00
runtime/ios	update sim to support Xcode 5.1	2014-03-26 11:27:50 +08:00
src	remove deprecated code in lua tests & template	2014-03-26 19:42:07 +08:00