minggo d4bd1d0c9a fix conflict		2016-07-08 18:15:57 +08:00
..
hellolua	remove ide-support in framework project	2016-07-08 18:07:57 +08:00
Android.mk	fix conflict	2016-07-08 18:15:57 +08:00
Application.mk	Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.	2015-07-22 12:01:34 +08:00