last adjustments before releasing 1.1 beta

textureAtlas contained a debug method, is now removed
PerformanceNodeChildrenTest contained a couple of illegal characters
Changed release date of 1.1 beta to 11-10-2011

CHANGELOG

@@ -1,12 +1,12 @@
-version 1.1 - XX-Oct-2011
+version 1.1 - 11-Oct-2011
 . [NEW] Animation: Added file format. AnimationCache can load animations from file
 . [NEW] ccConfig: Removed CC_RETINA_DISPLAY_FILENAME_SUFFIX. Use CCFileUtils API instead
 . [NEW] ccConfig: Removed CC_RETINA_DISPLAY_SUPPORT. It is always enabled.
 . [NEW] FileUtils: Added iPad / RetinaDisplay extension. To use it, call [CCFileUtils setiPadSuffix:@"-ipad"] or setRetinaDisplaySuffix (issue #1211)
 . [NEW] FileUtils: Added xxxFileExistAtPath for iPad and RetinaDisplay resources
-. [NEW] Node: improved speed when reordering nodes
+. [NEW] Node: improved speed when reordering and adding nodes (integration of reorderSprite branch)
 . [NEW] Particles: Added ParticleBatchNode (issue #955)
-. [NEW] Sprite: improved speed when reordering sprites
+. [NEW] Sprite: improved speed when reordering and adding sprites (integration of reorderSprite branch)
 . [NEW] Scheduler: Added support for delay and repeat (issue #630)
 . [NEW] Textures: Added support for RGB888 textures (issue #958)
 . [NEW] TileMap: TMX map supports flipped tiles (issue #1233)

cocos2d/CCTextureAtlas.h

@@ -128,6 +128,7 @@
 	@since 1.1
  */
 - (void) removeQuadsAtIndex:(NSUInteger) index amount:(uint) amount;
+
 /** removes all Quads.
  The TextureAtlas capacity remains untouched. No memory is freed.
  The total number of quads to be drawn will be 0
@@ -164,8 +165,6 @@
 */
 - (void) fillWithEmptyQuadsFromIndex:(uint) index amount:(uint) amount;
 
-- (void) printAllQuads;
-
 /** draws n quads
  * n can't be greater than the capacity of the Atlas
  */

cocos2d/CCTextureAtlas.m

@@ -412,17 +412,6 @@ -(void) moveQuadsFromIndex:(NSUInteger) index to:(NSUInteger) newIndex
 	memmove(quads_ + newIndex,quads_ + index, (totalQuads_ - index) * sizeof(quads_[0]));
 }
 
-- (void) printAllQuads
-{
-	CCLOG(@"total %i cap %i",totalQuads_,capacity_);
-	for (int i = 0; i < capacity_; i++)
-	{
-		ccV3F_C4B_T2F_Quad* quad = &(quads_[i]);
-		CCLOG(@"%i bl %f %f tr %f %f tex bl %f %f tr %f %f",i,quad->bl.vertices.x,quad->bl.vertices.y,quad->tr.vertices.x,quad->tr.vertices.y,quad->bl.texCoords.u,quad->bl.texCoords.v,
-			  quad->tr.texCoords.u,quad->tr.texCoords.v);
-	}
-}
-
 #pragma mark TextureAtlas - Drawing
 
 -(void) drawQuads

tests/PerformanceTests/PerformanceNodeChildrenTest/PerformanceNodeChildrenTest.h

@@ -69,7 +69,6 @@ enum {
 @interface ReorderSpriteSheet : AddRemoveSpriteSheet
 {}
 @end
-<<<<<<< HEAD
 
 @interface ReorderSpriteSheetInOrder : AddRemoveSpriteSheet
 {}
@@ -86,6 +85,5 @@ enum {
 @interface AddSpriteSheetInReverseOrder : AddRemoveSpriteSheet
 {}
 @end
-=======
->>>>>>> develop
+