Projects >> cocos2d >>e5bdc424d3a6f1465ac9e043ab7a0c13077da782

Chunk
Conflicting content 
package org.cocos2d.nodes;

<<<<<<< HEAD
=======
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.ArrayList;

import javax.microedition.khronos.opengles.GL10;

>>>>>>> 2cdb25ed7b819876b7ab1ac5915e2d2c0735999f
import org.cocos2d.config.ccConfig;
import org.cocos2d.opengl.CCTexture2D;
import org.cocos2d.types.CCTexParams;
Solution content 
package org.cocos2d.nodes;

import org.cocos2d.config.ccConfig;
import org.cocos2d.opengl.CCTexture2D;
import org.cocos2d.types.CCTexParams;
File
CCRibbon.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
package org.cocos2d.nodes;

<<<<<<< HEAD
import android.graphics.Bitmap;
=======
import java.util.Arrays;
import java.util.HashMap;

import javax.microedition.khronos.opengles.GL10;

>>>>>>> 2cdb25ed7b819876b7ab1ac5915e2d2c0735999f
import org.cocos2d.config.ccConfig;
import org.cocos2d.config.ccMacros;
import org.cocos2d.opengl.CCTexture2D;
Solution content 
package org.cocos2d.nodes;

import org.cocos2d.config.ccConfig;
import org.cocos2d.config.ccMacros;
import org.cocos2d.opengl.CCTexture2D;
File
CCSprite.java
Developer's decision
None
Kind of conflict
Import
Chunk
Conflicting content 
import org.cocos2d.opengl.CCTextureAtlas;
import org.cocos2d.protocols.CCRGBAProtocol;
import org.cocos2d.protocols.CCTextureProtocol;
<<<<<<< HEAD
import org.cocos2d.types.*;
import org.cocos2d.utils.BufferProvider;
=======
import org.cocos2d.types.CGAffineTransform;
import org.cocos2d.types.CGPoint;
import org.cocos2d.types.CGRect;
import org.cocos2d.types.CGSize;
import org.cocos2d.types.ccBlendFunc;
import org.cocos2d.types.ccColor3B;
import org.cocos2d.types.ccColor4B;
import org.cocos2d.utils.FastFloatBuffer;
>>>>>>> 2cdb25ed7b819876b7ab1ac5915e2d2c0735999f

import javax.microedition.khronos.egl.EGL10;
import javax.microedition.khronos.egl.EGLContext;
Solution content 
import org.cocos2d.opengl.CCTextureAtlas;
import org.cocos2d.protocols.CCRGBAProtocol;
import org.cocos2d.protocols.CCTextureProtocol;
import org.cocos2d.types.CGAffineTransform;
import org.cocos2d.types.CGPoint;
import org.cocos2d.types.CGRect;
import org.cocos2d.types.CGSize;
import org.cocos2d.types.ccBlendFunc;
import org.cocos2d.types.ccColor3B;
import org.cocos2d.types.ccColor4B;
import org.cocos2d.utils.FastFloatBuffer;
File
CCSprite.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
package org.cocos2d.nodes;

<<<<<<< HEAD
=======
import java.util.ArrayList;
import java.util.List;

import javax.microedition.khronos.opengles.GL10;

>>>>>>> 2cdb25ed7b819876b7ab1ac5915e2d2c0735999f
import org.cocos2d.config.ccConfig;
import org.cocos2d.config.ccMacros;
import org.cocos2d.opengl.CCDrawingPrimitives;
Solution content 
package org.cocos2d.nodes;

import org.cocos2d.config.ccConfig;
import org.cocos2d.config.ccMacros;
import org.cocos2d.opengl.CCDrawingPrimitives;
File
CCSpriteSheet.java
Developer's decision
Version 1
Kind of conflict
Import