all
init
newline
Merge branch 'master' of http://192.168.41.177/Bonobo.Git.Server/ds

Conflicts:
	.classpath
	.gitignore
	AndroidManifest.xml
	assets/gfx/1945.png
	res/layout/activity_game.xml
	res/values/strings.xml
	src/com/doubleshoot/alien/Alien.java
	src/com/doubleshoot/alien/AlienFactory.java
	src/com/doubleshoot/alien/DeadBulletBehavior.java
	src/com/doubleshoot/alien/RevengeBehavior.java
	src/com/doubleshoot/audio/BGM.java
	src/com/doubleshoot/audio/SE.java
	src/com/doubleshoot/behavior/ExplosionBehavior.java
	src/com/doubleshoot/behavior/IBehavior.java
	src/com/doubleshoot/behavior/VibrationBehavior.java
	src/com/doubleshoot/behavior/WoundedShining.java
	src/com/doubleshoot/body/BodyBuilder.java
	src/com/doubleshoot/body/BodyFactory.java
	src/com/doubleshoot/body/SimpleBodyBuilder.java
	src/com/doubleshoot/bullet/Barrel.java
	src/com/doubleshoot/bullet/Bullet.java
	src/com/doubleshoot/bullet/BulletEmitter.java
	src/com/doubleshoot/bullet/BulletListener.java
	src/com/doubleshoot/bullet/BulletPrototype.java
	src/com/doubleshoot/bullet/IBulletPrototype.java
	src/com/doubleshoot/bullet/NewBulletCallback.java
	src/com/doubleshoot/bullet/distribution/BulletDistribution.java
	src/com/doubleshoot/bullet/distribution/CircleDistribution.java
	src/com/doubleshoot/bullet/distribution/CountableBulletDistribution.java
	src/com/doubleshoot/bullet/distribution/ParrallelDistribution.java
	src/com/doubleshoot/bullet/distribution/RandomDirectionDistribution.java
	src/com/doubleshoot/bullet/distribution/ScatterDistribution.java
	src/com/doubleshoot/coordinate/EntityCoordinate.java
	src/com/doubleshoot/game/AllTextureRegions.java
	src/com/doubleshoot/game/Game.java
	src/com/doubleshoot/game/GameActivity.java
	src/com/doubleshoot/game/GameStartActivity.java
	src/com/doubleshoot/game/HeroDeadListener.java
	src/com/doubleshoot/game/ScreenShot.java
	src/com/doubleshoot/game/listener/CompositeGameListener.java
	src/com/doubleshoot/game/listener/ICompositeGameListener.java
	src/com/doubleshoot/game/listener/IGameListener.java
	src/com/doubleshoot/game/wxapi/WXEntryActivity.java
	src/com/doubleshoot/hero/Hero.java
	src/com/doubleshoot/hero/HeroFactory.java
	src/com/doubleshoot/hud/DefaultFontCreator.java
	src/com/doubleshoot/hud/DigitBit.java
	src/com/doubleshoot/hud/FontUtils.java
	src/com/doubleshoot/hud/GameScore.java
	src/com/doubleshoot/hud/GameStatusScene.java
	src/com/doubleshoot/hud/HudItem.java
	src/com/doubleshoot/hud/ITextCreator.java
	src/com/doubleshoot/hud/Lifebar.java
	src/com/doubleshoot/image/ImageProcesser.java
	src/com/doubleshoot/input/DoubleHeroController.java
	src/com/doubleshoot/input/HeroController.java
	src/com/doubleshoot/modifier/VisibilityEntityModifier.java
	src/com/doubleshoot/motion/IMotion.java
	src/com/doubleshoot/motion/PathMotion.java
	src/com/doubleshoot/motion/UniformVelocityMotion.java
	src/com/doubleshoot/object/AbstractGOFactory.java
	src/com/doubleshoot/object/ContactResolver.java
	src/com/doubleshoot/object/GOEnvironment.java
	src/com/doubleshoot/object/GameObject.java
	src/com/doubleshoot/object/ITaggedObject.java
	src/com/doubleshoot/object/TaggedObject.java
	src/com/doubleshoot/parallax/HVParallaxEntity.java
	src/com/doubleshoot/prefab/AlienType.java
	src/com/doubleshoot/prefab/InPlaceAlienLoader.java
	src/com/doubleshoot/prefab/InPlaceBulletLoader.java
	src/com/doubleshoot/score/IScoreChangeListener.java
	src/com/doubleshoot/score/IScorer.java
	src/com/doubleshoot/score/Scoreable.java
	src/com/doubleshoot/shape/RectangleFactory.java
	src/com/doubleshoot/shape/ShapeFactory.java
	src/com/doubleshoot/shape/TexturedSpriteFactory.java
	src/com/doubleshoot/share/QQZoneShare.java
	src/com/doubleshoot/share/WXShare.java
	src/com/doubleshoot/shooter/AbsorbDamage.java
	src/com/doubleshoot/shooter/AdditionDamage.java
	src/com/doubleshoot/shooter/BaseShooter.java
	src/com/doubleshoot/shooter/Border.java
	src/com/doubleshoot/shooter/FixtureFactory.java
	src/com/doubleshoot/shooter/GameObjectType.java
	src/com/doubleshoot/shooter/Harmful.java
	src/com/doubleshoot/shooter/ShooterVisualFilter.java
	src/com/doubleshoot/shooter/TagManager.java
	src/com/doubleshoot/texture/CachedTextureFactory.java
	src/com/doubleshoot/texture/ITextureFactory.java
	src/com/doubleshoot/texture/SimpleTextureRegion.java
	src/com/doubleshoot/troop/RandomTroopGenerator.java
	src/com/doubleshoot/troop/Randomizer.java
	src/com/doubleshoot/troop/SingleTroop.java
	src/com/doubleshoot/troop/VMotionFactory.java
mabi
aa
caonima
coanima
xx
dd
Merge branch 'master' of http://192.168.41.177/Bonobo.Git.Server/ds
share
recycle
Merge branch 'master' of http://192.168.41.177/Bonobo.Git.Server/ds
ss
Merge branch 'master' of https://github.com/etnlGD/Double-Shoot