Merge branch 'develop-v3' of github:cocos2d/cocos2d-iphone into develop-v3

slembcke · slembcke · commit b8d275997224 · 2014-02-28T09:56:19.000-06:00
Former-commit-id: 5770e80
diff --git a/VERSION b/VERSION
@@ -0,0 +1 @@
+3.0.0
diff --git a/cocos2d/CCLayoutBox.m b/cocos2d/CCLayoutBox.m
@@ -84,7 +84,7 @@ - (void) layout
         
         // Position the nodes
         float height = 0;
-        for (CCNode* child in [[self.children reverseObjectEnumerator] allObjects])
+        for (CCNode* child in self.children)
         {
             CGSize childSize = child.contentSizeInPoints;
             

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ - (void) layout`
`84`	`84`
`85`	`85`	`// Position the nodes`
`86`	`86`	`float height = 0;`
`87`		`- for (CCNode* child in [[self.children reverseObjectEnumerator] allObjects])`
	`87`	`+ for (CCNode* child in self.children)`
`88`	`88`	`{`
`89`	`89`	`CGSize childSize = child.contentSizeInPoints;`
`90`	`90`