James Chen 82cd7bb01f Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master		2013-06-14 15:41:01 +08:00
..
.externalToolBuilders	Adding missing eclipse project files	2013-03-07 12:13:50 -08:00
Classes	Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master	2013-06-14 15:41:01 +08:00
Resources	Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x	2013-06-08 22:09:34 +08:00
proj.android	standardize code	2013-06-07 10:52:32 +08:00
proj.blackberry	[BB] Updating project configuration after adding CocoStudio runtime.	2013-06-09 15:29:51 +08:00
proj.emscripten	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
proj.ios	issue #2284: fix bugs after merging master	2013-06-14 14:34:50 +08:00
proj.linux	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
proj.mac	issue #2284: fix bugs after merging master	2013-06-14 14:34:50 +08:00
proj.marmalade	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
proj.nacl	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
proj.tizen	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
proj.win32	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
.cproject	Adding missing eclipse project files	2013-03-07 12:13:50 -08:00
Android.mk	issue #2284: fix bugs after merging master	2013-06-14 14:34:50 +08:00