commit uncommitted

26.08.2013
Merge branch 'Patrik' of https://github.com/ForceField-IndieGames/marscity into Patrik

Conflicts:
	mars city.log
	res/settings/settings.xml
	src/game/ResourceManager.java
	src/gui/GUI.java

 It looks like you may be committing a merge.
 If this is not correct, please remove the file
	.git/MERGE_HEAD
 and try again.

 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch Patrik
 Your branch and 'origin/Patrik' have diverged,
 and have 1 and 141 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)

 All conflicts fixed but you are still merging.
   (use "git commit" to conclude merge)

 Changes to be committed:

	modified:   .gitignore
	modified:   TODO
	modified:   mars city.log
	modified:   res/lang/DE.xml
	modified:   res/settings/settings.xml
	modified:   src/animation/Animatable.java
	modified:   src/animation/AnimationManager.java
	modified:   src/animation/AnimationValue.java
	new file:   src/animation/CustomAnimationValue.java
	new file:   src/buildings/Bank.java
	new file:   src/buildings/BigHouse.java
	new file:   src/buildings/CityCenter.java
	new file:   src/buildings/FusionPower.java
	new file:   src/buildings/GarbageYard.java
	new file:   src/buildings/Hangar.java
	new file:   src/buildings/House.java
	new file:   src/buildings/MedicalCenter.java
	new file:   src/buildings/Police.java
	new file:   src/buildings/ResearchStation.java
	new file:   src/buildings/ServerCenter.java
	new file:   src/buildings/SolarPower.java
	new file:   src/buildings/Street.java
	modified:   src/effects/Particle.java
	modified:   src/effects/ParticleEffect.java
	modified:   src/effects/ParticleEffects.java
	deleted:    src/game/BufferTools.java
	new file:   src/game/BuildingTask.java
	modified:   src/game/Camera.java
	new file:   src/game/DataView.java
	new file:   src/game/EntityTexture.java
	modified:   src/game/Game.java
	modified:   src/game/Grid.java
	modified:   src/game/GridCell.java
	modified:   src/game/Main.java
	new file:   src/game/MonthlyActions.java
	modified:   src/game/ResourceManager.java
	new file:   src/game/Supply.java
	new file:   src/game/TransactionCategory.java
	deleted:    src/gui/AbstractGuiElement.java
	new file:   src/gui/BasicGuiElement.java
	new file:   src/gui/BuildingButton.java
	new file:   src/gui/BuildingCategories.java
	new file:   src/gui/BuildingInfo.java
	new file:   src/gui/BuildingPanel.java
	new file:   src/gui/BuildingPanels.java
	new file:   src/gui/BuildingToolTip.java
	new file:   src/gui/CategoryButton.java
	new file:   src/gui/CityPreview.java
	new file:   src/gui/DataViewButton.java
	modified:   src/gui/GUI.java
	deleted:    src/gui/GuiButton.java
	new file:   src/gui/GuiEvent.java
	new file:   src/gui/GuiEventType.java
	deleted:    src/gui/GuiLabel.java
	deleted:    src/gui/GuiPanel.java
	new file:   src/gui/LoadingScreen.java
	new file:   src/gui/MsgBox.java
	new file:   src/gui/ToolTip.java
	deleted:    src/gui/guiElement.java
	new file:   src/guielements/GuiButton.java
	new file:   src/guielements/GuiCheckbox.java
	new file:   src/guielements/GuiGraph.java
	new file:   src/guielements/GuiLabel.java
	new file:   src/guielements/GuiNumberbox.java
	new file:   src/guielements/GuiPanel.java
	new file:   src/guielements/GuiProgressbar.java
	new file:   src/guielements/GuiQuad.java
	new file:   src/guielements/GuiRadiobutton.java
	new file:   src/guielements/GuiScrollBar.java
	new file:   src/guielements/GuiScrollablePanel.java
	new file:   src/guielements/GuiTextbox.java
	modified:   src/objects/BuildPreview.java
	modified:   src/objects/Building.java
	modified:   src/objects/BuildingType.java
	new file:   src/objects/Buildings.java
	modified:   src/objects/Drawable.java
	modified:   src/objects/Entity.java
	new file:   src/objects/Mesh.java
	deleted:    src/objects/Model.java
	modified:   src/objects/ObjectLoader.java
	modified:   src/objects/Sprite.java
	new file:   src/objects/Streets.java
	modified:   src/objects/Terrain.java
	deleted:    src/res/ForceField.png
	deleted:    src/res/bighouse.mtl
	deleted:    src/res/bighouse.obj
	deleted:    src/res/bighousetexture.png
	deleted:    src/res/forcefieldbackground.png
	deleted:    src/res/guiadd.png
	deleted:    src/res/guibutton.png
	deleted:    src/res/guibutton2.png
	deleted:    src/res/guibutton2down.png
	deleted:    src/res/guidelete.png
	deleted:    src/res/guimenu.png
	deleted:    src/res/guimenubutton.png
	deleted:    src/res/guiselect.png
	deleted:    src/res/guitoolbar.png
	deleted:    src/res/guitoolsBG.png
	deleted:    src/res/house.mtl
	deleted:    src/res/house.obj
	deleted:    src/res/housetexture.png
	deleted:    src/res/lang/DE.xml
	deleted:    src/res/mainmenubg.png
deleted:    src/res/mars.png
	deleted:    src/res/marscitylogo.png
	deleted:    src/res/saves/savegame.xml
	renamed:    src/res/shader.f -> src/res/shader/shader.f
	renamed:    src/res/shader.v -> src/res/shader/shader.v
	renamed:    src/res/destroy.wav -> src/res/sounds/destroy.wav
	renamed:    src/res/drop.wav -> src/res/sounds/drop.wav
	deleted:    src/res/terrain.mtl
	deleted:    src/res/terrain.obj
	renamed:    src/res/empty.png -> src/res/textures/empty.png
	renamed:    src/res/fogparticle.png -> src/res/textures/fogparticle.png