Ricardo Quesada 79ebc546f8 Merge remote-tracking branch 'cocos2d/v3' into normalized_position ... Conflicts: CHANGELOG cocos/ui/UILayout.cpp		2014-06-04 09:19:22 -07:00
..
cpp-empty-test	Support Fast App Resume.	2014-06-04 11:19:53 +08:00
cpp-tests	Merge remote-tracking branch 'cocos2d/v3' into normalized_position	2014-06-04 09:19:22 -07:00
lua-empty-test	Update lua-template and lua-empty-test for replacing bgMusicPath	2014-05-28 10:27:03 +08:00
lua-tests	Merge pull request #6820 from newnon/v3_android_improvements	2014-05-27 10:17:03 +08:00