Fix merge damage affecting android build

Author: marcsalem

cocos2d-tests-android/Headless.xcodeproj/project.pbxproj

@@ -73,7 +73,6 @@
 		5B0ED736196E54BD00F9868F /* Sounds in Resources */ = {isa = PBXBuildFile; fileRef = 5B0ED735196E54BD00F9868F /* Sounds */; };
 		5B0ED738196E550000F9868F /* Particles in Resources */ = {isa = PBXBuildFile; fileRef = 5B0ED737196E550000F9868F /* Particles */; };
 		5B165F63195CE564002338B1 /* CCBMFontTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B165F49195CE564002338B1 /* CCBMFontTest.m */; };
-		5B165F64195CE564002338B1 /* CCEffectPongTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B165F4A195CE564002338B1 /* CCEffectPongTest.m */; };
 		5B165F65195CE564002338B1 /* CCEffectsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B165F4B195CE564002338B1 /* CCEffectsTest.m */; };
 		5B165F66195CE564002338B1 /* CCLabelTTFTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B165F4C195CE564002338B1 /* CCLabelTTFTest.m */; };
 		5B165F67195CE564002338B1 /* CCLayoutTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B165F4D195CE564002338B1 /* CCLayoutTest.m */; };
@@ -243,7 +242,6 @@
 		5B165F43195CE3F0002338B1 /* SimpleScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimpleScene.h; sourceTree = "<group>"; };
 		5B165F44195CE3F0002338B1 /* SimpleScene.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SimpleScene.m; sourceTree = "<group>"; };
 		5B165F49195CE564002338B1 /* CCBMFontTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCBMFontTest.m; sourceTree = "<group>"; };
-		5B165F4A195CE564002338B1 /* CCEffectPongTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectPongTest.m; sourceTree = "<group>"; };
 		5B165F4B195CE564002338B1 /* CCEffectsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectsTest.m; sourceTree = "<group>"; };
 		5B165F4C195CE564002338B1 /* CCLabelTTFTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCLabelTTFTest.m; sourceTree = "<group>"; };
 		5B165F4D195CE564002338B1 /* CCLayoutTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCLayoutTest.m; sourceTree = "<group>"; };
@@ -418,7 +416,6 @@
 			isa = PBXGroup;
 			children = (
 				5B165F49195CE564002338B1 /* CCBMFontTest.m */,
-				5B165F4A195CE564002338B1 /* CCEffectPongTest.m */,
 				5B165F4B195CE564002338B1 /* CCEffectsTest.m */,
 				5B165F4C195CE564002338B1 /* CCLabelTTFTest.m */,
 				5B165F4D195CE564002338B1 /* CCLayoutTest.m */,
@@ -832,7 +829,6 @@
 				5B165F73195CE564002338B1 /* ColorPickerTest.m in Sources */,
 				D242C50E1958D78700E7726D /* MainMenu.m in Sources */,
 				5B165F72195CE564002338B1 /* CCTransitionTest.m in Sources */,
-				5B165F64195CE564002338B1 /* CCEffectPongTest.m in Sources */,
 				5B165F7A195CE564002338B1 /* TextureTest.m in Sources */,
 				5B165F76195CE564002338B1 /* ParallaxTest.m in Sources */,
 				5B165F71195CE564002338B1 /* CCTextureCacheTest.m in Sources */,

cocos2d/CCRenderTexture.m

@@ -180,7 +180,7 @@ -(void)create
 
 -(void)createTextureAndFboWithPixelSize:(CGSize)pixelSize
 {
-	glPushGroupMarkerEXT(0, "CCRenderTexture: Create");
+	CCGL_DEBUG_PUSH_GROUP_MARKER("CCRenderTexture: Create");
 
 	glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_oldFBO);