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

Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3

This commit is contained in:
pandamicro 2015-06-04 17:53:00 +08:00
parent 83f7f30c1c ba1191f98f
commit 9576adeafb
4 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos/base/CCData.cpp
View File

@ -24,6 +24,7 @@
****************************************************************************/
#include "base/CCData.h"
#include "base/CCConsole.h"
NS_CC_BEGIN

1
cocos/base/CCEventListener.cpp
View File

@ -23,6 +23,7 @@
****************************************************************************/
#include "base/CCEventListener.h"
#include "base/CCConsole.h"
NS_CC_BEGIN

1
cocos/base/CCEventListenerAcceleration.cpp
View File

@ -24,6 +24,7 @@
#include "base/CCEventListenerAcceleration.h"
#include "base/CCEventAcceleration.h"
#include "base/CCConsole.h"
NS_CC_BEGIN

2
tools/cocos2d-console

@ -1 +1 @@
Subproject commit 3c9958a1d2fc1ce1cea582c6bde0efc5a9537654
Subproject commit 4f0fd0a30f010756e01a0e1b9c341873e981c10a