axmol/cocos2dx/platform/marmalade
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
..
CCAccelerometer_marmalade.cpp Merged from gitbub.gom/gzito, marmalade support, remove airplay 2011-12-10 20:59:48 -08:00
CCAccelerometer_marmalade.h Merged from gitbub.gom/gzito, marmalade support, remove airplay 2011-12-10 20:59:48 -08:00
CCApplication_marmalade.cpp Merge branch 'master' of https://github.com/styck/cocos2d-x into pullrequest#611 2011-12-15 13:03:07 +08:00
CCApplication_marmalade.h Merged from gitbub.gom/gzito, marmalade support, remove airplay 2011-12-10 20:59:48 -08:00
CCEGLView_marmalade.cpp Rollback changes about CCDirector::sharedInstance as pointer 2011-12-12 14:50:35 +01:00
CCEGLView_marmalade.h Merged from gitbub.gom/gzito, marmalade support, remove airplay 2011-12-10 20:59:48 -08:00
CCFileUtils_marmalade.cpp Merged from gitbub.gom/gzito, marmalade support, remove airplay 2011-12-10 20:59:48 -08:00
CCImage_marmalade.cpp Rollback changes about CCDirector::sharedInstance as pointer 2011-12-12 14:50:35 +01:00