Skip to content

Commit

Permalink
Merge pull request #37 from nantas/master
Browse files Browse the repository at this point in the history
fixed cc.Object api comment.
  • Loading branch information
nantas committed Dec 12, 2015
2 parents fbc2bbc + 1df8075 commit a95b73f
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion cocos2d/core/platform/CCObject.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ var PersistentMask = ~(ToDestroy | Dirty | Destroying | DontDestroy |

/**
* The base class of most of all the objects in Fireball.
* @class CCObject
* @class Object
* @constructor
* @main
* @private
*/
function CCObject () {
Expand Down Expand Up @@ -169,6 +170,10 @@ if (CC_EDITOR) {

// MEMBER

/**
* @class Object
*/

var prototype = CCObject.prototype;

/**
Expand Down

0 comments on commit a95b73f

Please sign in to comment.