James Chen 3ffad35f0e Merge pull request #3741 from signmotion/develop ... Fixed some compiling-warnings (MSVC2012).[ci skip]		2013-09-24 02:27:14 -07:00
..
BaseClasses	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #4684	2013-09-17 22:41:42 +08:00
Layouts	Modify layout enum	2013-09-23 21:26:44 +08:00
System	Remove layoutexecutant class	2013-09-23 19:16:20 +08:00
UIWidgets	Merge pull request #3741 from signmotion/develop	2013-09-24 02:27:14 -07:00