yangws
|
21c8628e68
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input2
Conflicts:
cocos2dx/platform/wophone/CCApplication_wophone.h
tests/tests/tests.h
|
2011-05-10 16:09:26 +08:00 |
yangws
|
ced029257f
|
temp commit
|
2011-05-06 16:38:09 +08:00 |
minggo
|
33648a9e9b
|
issue #455: add compile CCUserDefault to WoPhone, but not test, because the path will change later
|
2011-05-06 16:14:07 +08:00 |
natural-law
|
df00c32d5b
|
fixed #466. [wophone] Modify the template and the Makefile.ARM file for wophone.
|
2011-04-22 11:49:14 +08:00 |
minggo
|
c38af3c28d
|
fixed #456: integrate libcurl into cocos2dx
|
2011-04-19 10:57:44 +08:00 |
natural-law
|
c8b0d391cd
|
fixed #411,Add ZwoptexTest on ios, wophone, android and airplay.Fix the bug in ios templates which generated by merge.
|
2011-03-30 15:21:18 +08:00 |
walzer
|
a205df20a4
|
issue #390, manually merge from Bin's work.
|
2011-03-25 13:59:08 +08:00 |
natural-law
|
93aebbc469
|
[wophone]fixed #386,Resolve the compile conflict on wophone sdk.Modify the makefiles for wophone.
|
2011-03-10 14:24:13 +08:00 |
natural-law
|
7c6147421b
|
[wophone]fixed #377,Replace the word "uphone" with "wophone".
|
2011-03-09 17:28:35 +08:00 |