Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/minggo/cocos2d-x into iss888_linux_eclipse

This commit is contained in:
minggo 2011-12-23 11:13:14 +08:00
parent 61e87f661b 333342afe2
commit 48aa511116
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id
View File

@ -1 +1 @@
6bfa837a79e8131bc323421079ad98e240fc9b5b
e27fa2cc5ca56a58b1eca3e5e3d64cab63f7ba68

2
tools/tolua++/CCActionManager.pkg
View File

@ -23,8 +23,6 @@ public:
void pauseTarget(CCObject *pTarget);
void resumeTarget(CCObject *pTarget);
void purgeSharedManager(void);
void selectorProtocolRetain(void);
void selectorProtocolRelease(void);
static CCActionManager* sharedManager(void);
};

4
tools/tolua++/selector_protocol.pkg
View File

@ -14,10 +14,6 @@ public:
void callfunc(CCNode* pSender, void* pData);
void menuHandler(CCObject* pSender);
void eventHandler(CCEvent* pEvent);
// the child call responding retain/release function
void selectorProtocolRetain(void);
void selectorProtocolRelease(void);
};
/*
class CCNode;