Skip to content
This repository has been archived by the owner on Feb 23, 2023. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/pixi/core/sprites/Sprite.hx
  • Loading branch information
adireddy committed Jan 12, 2017
2 parents 2860ee8 + 79c0f0a commit 1c5aa3f
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion src/pixi/core/sprites/Sprite.hx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package pixi.core.sprites;

import pixi.core.math.shapes.Rectangle;
import haxe.extern.EitherType;
import pixi.core.math.Point;
import pixi.core.textures.Texture;
Expand Down

0 comments on commit 1c5aa3f

Please sign in to comment.