6 Commits

Author	SHA1	Message	Date
dumganhar	8298e0b6ff	Merge branch 'master' of https://github.com/styck/cocos2d-x into pullrequest#611 ... Conflicts: tests/test.marmalade/test.mkb	2011-12-15 13:03:07 +08:00
styck	b1cdb6543d	Updated ccLanguageType CCApplication::getCurrentLanguage() to return the current language ... Added tests for Marmalade and enabled language and font testing	2011-12-11 17:18:01 -08:00
gzito	47e108a8c5	Added marmalade support, removed airplay	2011-12-11 10:19:41 +01:00
gzito	f27f9180ff	Merge remote-tracking branch 'remotes/styck/master'	2011-12-10 11:10:59 +01:00
Giovanni Zito	0a7a000c2d	Changed symbols from "airplay" to "marmalade", added files and folders for marmalade	2011-12-08 12:21:48 +01:00
Giovanni Zito	1eb8ba656e	Added marmalade folder	2011-12-08 11:15:20 +01:00