yangws
|
041953151a
|
issue #439 CCFileData and imageWithImageFile modified on win32.
|
2011-03-29 11:41:44 +08:00 |
natural-law
|
e38d3a2277
|
Merge branch 'master' into iss434
Conflicts:
cocos2dx/platform/airplay/CCFileUtils_airplay.h
template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
|
2011-03-28 17:06:32 +08:00 |
natural-law
|
28a940ab57
|
issue #434,refactor class CCFileUtils on win32 and wophone.
|
2011-03-26 13:52:33 +08:00 |
walzer
|
95d672a858
|
add copyright & author name for airplay port
|
2011-03-25 15:30:10 +08:00 |
walzer
|
db4fb7cc9c
|
issue #427, refactor ios port ok.
|
2011-03-24 17:51:29 +08:00 |