James Chen a36446cba2 Merge branch 'iss1603-adjust-directory' of https://github.com/minggo/cocos2d-x into iss1603-adjust-directory		2012-12-20 18:39:52 +08:00
..
Classes	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00
Resources/luaScript	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00
proj.android	Updated android build files.	2012-12-20 14:04:49 +08:00
proj.ios	issue #1603:build ok on mac	2012-12-20 18:02:24 +08:00
proj.linux	issue #1603: updated linux project configuration.	2012-12-20 17:49:34 +08:00
proj.marmalade	issue #1603: updated blackberry, linux, marmalade project configurations.	2012-12-20 17:47:30 +08:00
proj.win32	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00