On branch master
 Your branch is up-to-date with 'origin/master'.
 Changes to be committed:
	new file:   doc/m0sh.xmi
	new file:   trunk/junk/_old/dev/cpp/m0sh/deployment.pri
	new file:   trunk/junk/_old/dev/cpp/m0sh/m0sh.pro
	new file:   trunk/junk/_old/dev/cpp/m0sh/m0sh.pro.user
	new file:   trunk/junk/_old/dev/cpp/m0sh/main.cpp
	new file:   trunk/junk/_old/dev/editor/sharp/Untitled Folder/sharp.sln
	new file:   trunk/junk/_old/dev/editor/sharp/Untitled Folder/sharp.userprefs
	new file:   trunk/junk/_old/dev/editor/sharp/Untitled Folder/sharp/Properties/AssemblyInfo.cs
	new file:   trunk/junk/_old/dev/editor/sharp/Untitled Folder/sharp/bin/Debug/sharp.exe
	new file:   trunk/junk/_old/dev/editor/sharp/Untitled Folder/sharp/bin/Debug/sharp.exe.mdb
	new file:   trunk/junk/_old/dev/editor/sharp/Untitled Folder/sharp/obj/x86/Debug/.NETFramework,Version=v4.0.AssemblyAttribute.cs
	new file:   trunk/junk/_old/dev/editor/sharp/Untitled Folder/sharp/obj/x86/Debug/sharp.csproj.FilesWrittenAbsolute.txt
	new file:   trunk/junk/_old/dev/editor/sharp/Untitled Folder/sharp/obj/x86/Debug/sharp.exe
	new file:   trunk/junk/_old/dev/editor/sharp/Untitled Folder/sharp/obj/x86/Debug/sharp.exe.mdb
	new file:   trunk/junk/_old/dev/editor/sharp/Untitled Folder/sharp/sharp.csproj
	new file:   trunk/junk/_old/dev/editor/sharp/Untitled Folder/sharp/src/Main.cs
	new file:   trunk/junk/_old/dev/editor/sharp/Untitled Folder/sharp/src/controls/MapView.cs
	new file:   trunk/junk/_old/dev/editor/sharp/Untitled Folder/sharp/src/forms/FMain.cs
	new file:   trunk/junk/_old/dev/editor/sharp/m0sh/m0sh.sln
	new file:   trunk/junk/_old/dev/editor/sharp/m0sh/m0sh.userprefs
	new file:   trunk/junk/_old/dev/editor/sharp/m0sh/m0sh/Properties/AssemblyInfo.cs
	new file:   trunk/junk/_old/dev/editor/sharp/m0sh/m0sh/bin/Debug/m0sh.exe
	new file:   trunk/junk/_old/dev/editor/sharp/m0sh/m0sh/bin/Debug/m0sh.exe.mdb
	new file:   trunk/junk/_old/dev/editor/sharp/m0sh/m0sh/m0sh.csproj
	new file:   trunk/junk/_old/dev/editor/sharp/m0sh/m0sh/obj/x86/Debug/.NETFramework,Version=v4.5.AssemblyAttribute.cs
	new file:   trunk/junk/_old/dev/editor/sharp/m0sh/m0sh/obj/x86/Debug/m0sh.csproj.FilesWrittenAbsolute.txt
	new file:   trunk/junk/_old/dev/editor/sharp/m0sh/m0sh/obj/x86/Debug/m0sh.exe
	new file:   trunk/junk/_old/dev/editor/sharp/m0sh/m0sh/obj/x86/Debug/m0sh.exe.mdb
	new file:   trunk/junk/_old/dev/editor/sharp/m0sh/m0sh/src/Main.cs
	new file:   trunk/junk/_old/dev/editor/sharp/m0sh/m0sh/src/editor/controls/LevelRender.cs
	new file:   trunk/junk/_old/dev/editor/sharp/m0sh/m0sh/src/editor/forms/FAbout.cs
	new file:   trunk/junk/_old/dev/editor/sharp/m0sh/m0sh/src/editor/forms/FMain.cs
	new file:   trunk/junk/_old/dev/editor/vbn/bin/test
	new file:   trunk/junk/_old/dev/editor/vbn/build.sh
	new file:   trunk/junk/_old/dev/editor/vbn/src/Main.vb
	new file:   trunk/junk/_old/dev/editor/vbn/src/controls/MapView.vb
	new file:   trunk/junk/_old/dev/editor/vbn/src/forms/FMain.vb
	new file:   trunk/junk/_old/dev/editor/vbn/src/objects/Entity.vb
	new file:   trunk/junk/_old/dev/editor/vbn/src/objects/Level.vb
	new file:   trunk/junk/_old/dev/game/py/src/Animation.py
	new file:   trunk/junk/_old/dev/game/py/src/DataManager.py
	new file:   trunk/junk/_old/dev/game/py/src/Enemy.py
	new file:   trunk/junk/_old/dev/game/py/src/Entity.py
	new file:   trunk/junk/_old/dev/game/py/src/FpsCounter.py
	new file:   trunk/junk/_old/dev/game/py/src/Item.py
	new file:   trunk/junk/_old/dev/game/py/src/Level.py
	new file:   trunk/junk/_old/dev/game/py/src/OverWorld.py
	new file:   trunk/junk/_old/dev/game/py/src/Particle.py
	new file:   trunk/junk/_old/dev/game/py/src/Player.py
	new file:   trunk/junk/_old/dev/game/py/src/Projectile.py
	new file:   trunk/junk/_old/dev/game/py/src/Scene.py
	new file:   trunk/junk/_old/dev/game/py/src/Scenes/Death.py
	new file:   trunk/junk/_old/dev/game/py/src/Scenes/Main.py
	new file:   trunk/junk/_old/dev/game/py/src/Scenes/OverWorld.py
	new file:   trunk/junk/_old/dev/game/py/src/Scenes/Title.py
	new file:   trunk/junk/_old/dev/game/py/src/Spell.py
	new file:   trunk/junk/_old/dev/game/py/src/UI/Button.py
	new file:   trunk/junk/_old/dev/game/py/src/UI/ListBox.py
	new file:   trunk/junk/_old/dev/game/py/src/UI/ProgressBar.py
	new file:   trunk/junk/_old/dev/game/py/src/UI/TextLabel.py
	new file:   trunk/junk/_old/dev/game/py/src/UI/TickBox.py
	new file:   trunk/junk/_old/dev/game/py/src/UI/UIBase.py
	new file:   trunk/junk/_old/dev/game/py/src/UI/Window.py
	new file:   trunk/junk/_old/dev/game/py/src/__pycache__/Enemy.cpython-34.pyc
	new file:   trunk/junk/_old/dev/game/py/src/__pycache__/Entity.cpython-34.pyc
	new file:   trunk/junk/_old/dev/game/py/src/main.py
	new file:   trunk/junk/_old/dev/test/pysfml/LiberationMono-Regular.ttf
	new file:   trunk/junk/_old/dev/test/pysfml/__pycache__/fps_counter.cpython-34.pyc
	new file:   trunk/junk/_old/dev/test/pysfml/bull.png
	new file:   trunk/junk/_old/dev/test/pysfml/fps_counter.py
	new file:   trunk/junk/_old/dev/test/pysfml/fps_counter.pyc
	new file:   trunk/junk/_old/dev/test/pysfml/run.sh
	new file:   trunk/junk/_old/dev/test/pysfml/test.py
	new file:   trunk/junk/_old/dev/test/pysfml/untitled.png
	new file:   trunk/junk/_old/dev/test/vbn/test/bin/test
	new file:   trunk/junk/_old/dev/test/vbn/test/build.sh
	new file:   trunk/junk/_old/dev/test/vbn/test/src/Main.vb
	new file:   trunk/junk/_old/dev/test/vbn/test/src/folder/CTest.vb
	new file:   trunk/junk/_old/dev/test/vbn/test/src/folder/Module.vb
	new file:   trunk/junk/_old/dev/test/vbn/winform_test/bin/test
	new file:   trunk/junk/_old/dev/test/vbn/winform_test/build.sh
	new file:   trunk/junk/_old/dev/test/vbn/winform_test/src/Main.vb
	new file:   trunk/junk/_old/dev/test/vbn/winform_test/src/forms/FMain.vb
	new file:   trunk/junk/_old/dev/waagh
	new file:   trunk/junk/_old/res/img/character/14308.png
	new file:   trunk/junk/_old/res/img/enemy/11984.png
	new file:   trunk/junk/_old/res/img/enemy/13773.png
	new file:   trunk/junk/_old/res/img/enemy/13774.png
	new file:   trunk/junk/_old/res/img/enemy/13785.png
	new file:   trunk/junk/_old/res/img/enemy/13789.png
	new file:   trunk/junk/_old/res/img/enemy/13790.png
	new file:   trunk/junk/_old/res/img/enemy/13791.png
	new file:   trunk/junk/_old/res/img/enemy/13792.png
	new file:   trunk/junk/_old/res/img/enemy/13797.png
	new file:   trunk/junk/_old/res/img/enemy/13799.png
	new file:   trunk/junk/_old/res/img/enemy/20175.png
	new file:   trunk/junk/_old/res/img/enemy/20186.png
	new file:   trunk/junk/_old/res/img/enemy/32448.png
	new file:   trunk/junk/_old/res/img/enemy/32462.png
	new file:   trunk/junk/_old/res/img/enemy/32565.png
	new file:   trunk/junk/_old/res/img/junk/GameOver0.png
	new file:   trunk/junk/_old/res/img/junk/Title.png
	new file:   trunk/junk/_old/res/img/junk/Title0.png
	new file:   trunk/junk/_old/res/img/misc/13769.png
	new file:   trunk/junk/_old/res/img/misc/13775.png
	new file:   trunk/junk/_old/res/img/misc/20161.png
	new file:   trunk/junk/_old/res/img/misc/20174.png
	new file:   trunk/junk/_old/res/img/misc/20184.png
	new file:   trunk/junk/_old/res/img/misc/2286.png
	new file:   trunk/junk/_old/res/img/npc/20187.png
	new file:   trunk/junk/_old/res/img/npc/20188.png
	new file:   trunk/junk/_old/res/img/npc/20189.png
	new file:   trunk/junk/_old/res/img/npc/32510.png
	new file:   trunk/junk/_old/res/img/sfx/11988.png
	new file:   trunk/junk/_old/res/img/sfx/15037.png
	new file:   trunk/junk/_old/res/img/sfx/15038.png
	new file:   trunk/junk/_old/res/img/sfx/20001.png
	new file:   trunk/junk/_old/res/img/sfx/20002.png
	new file:   trunk/junk/_old/res/img/sfx/20003.png
	new file:   trunk/junk/_old/res/img/sfx/20004.png
	new file:   trunk/junk/_old/res/img/sfx/20160.png
	new file:   trunk/junk/_old/res/img/sfx/20170.png
	new file:   trunk/junk/_old/res/img/sfx/26938.png
	new file:   trunk/junk/_old/res/img/sfx/26939.png
	new file:   trunk/junk/_old/res/img/sfx/27019.png
	new file:   trunk/junk/_old/res/img/sfx/27021.png
	new file:   trunk/junk/_old/res/img/sfx/32370.gif
	new file:   trunk/junk/_old/res/img/sfx/32450.png
	new file:   trunk/junk/_old/res/img/sfx/32451.png
	new file:   trunk/junk/_old/res/img/sfx/32550.png
	new file:   trunk/junk/_old/res/img/sfx/32566.png
	new file:   trunk/junk/_old/res/img/sfx/32567.png
	new file:   trunk/junk/_old/res/img/sfx/37862.png
	new file:   trunk/junk/_old/res/img/sfx/40234.png
	new file:   trunk/junk/_old/res/img/sfx/45222.png
	new file:   trunk/junk/_old/res/img/sfx/45251.png
	new file:   trunk/junk/_old/res/img/sfx/5122.png
	new file:   trunk/junk/_old/res/img/sfx/54461.gif
	new file:   trunk/junk/_old/res/img/sfx/54596.png
	new file:   trunk/junk/_old/res/img/sfx/54692.png
	new file:   trunk/junk/_old/res/img/sfx/56172.png
	new file:   trunk/junk/_old/res/img/sfx/56173.png
	new file:   trunk/junk/_old/res/img/sfx/56185.png
	new file:   trunk/junk/_old/res/img/sfx/56197.png
	new file:   trunk/junk/_old/res/img/sfx/56200.png
	new file:   trunk/junk/_old/res/img/sfx/56202.png
	new file:   trunk/junk/_old/res/img/sfx/56435.png
	new file:   trunk/junk/_old/res/img/sfx/56457.png
	new file:   trunk/junk/_old/res/img/sfx/58847.png
	new file:   trunk/junk/_old/res/img/sfx/60900.png
	new file:   trunk/junk/_old/res/img/sfx/61893.png
	new file:   trunk/junk/_old/res/img/sfx/6651.png
	new file:   trunk/junk/_old/res/img/sfx/6669.png
	new file:   trunk/junk/_old/res/img/sfx/6705.png
	new file:   trunk/junk/_old/res/img/tileset/12898.png
	new file:   trunk/junk/_old/res/img/tileset/20163.png
	new file:   trunk/junk/_old/res/img/tileset/20167.png
	new file:   trunk/junk/_old/res/img/tileset/20178.png
	new file:   trunk/junk/_old/res/img/tileset/20185.png
	new file:   trunk/junk/_old/res/img/tileset/20194.png
	new file:   trunk/junk/_old/res/img/tileset/22862.png
	new file:   trunk/junk/_old/res/img/tileset/28546.png
	new file:   trunk/junk/_old/res/img/tileset/36708.png
	new file:   trunk/junk/_old/res/img/tileset/38054.png
	new file:   trunk/junk/_old/res/img/tileset/38986.png
	new file:   trunk/junk/_old/res/img/tileset/38994.png
	new file:   trunk/junk/_old/res/img/tileset/43481.png
	new file:   trunk/junk/_old/res/img/tileset/45187.png
	new file:   trunk/junk/_old/res/img/tileset/4596.png
	new file:   trunk/junk/_old/res/img/tileset/47646.png
	new file:   trunk/junk/_old/res/img/tileset/51099.png
	new file:   trunk/junk/_old/res/img/tileset/51115.png
	new file:   trunk/junk/_old/res/img/tileset/51162.png
	new file:   trunk/junk/_old/res/img/tileset/52198.png
	new file:   trunk/junk/_old/res/img/tileset/52688.png
	new file:   trunk/junk/_old/res/img/tileset/53622.png
	new file:   trunk/junk/_old/res/img/tileset/53633.png
	new file:   trunk/junk/_old/res/img/tileset/53637.png
	new file:   trunk/junk/_old/res/img/tileset/53646.png
	new file:   trunk/junk/_old/res/img/tileset/53653.png
	new file:   trunk/junk/_old/res/img/tileset/57510.png
	new file:   trunk/junk/_old/res/img/tileset/58972.png
	new file:   trunk/junk/_old/res/img/tileset/6211.png
	new file:   trunk/res/img/character/14308.png
	new file:   trunk/res/img/enemy/11984.png
	new file:   trunk/res/img/enemy/13773.png
	new file:   trunk/res/img/enemy/13774.png
	new file:   trunk/res/img/enemy/13785.png
	new file:   trunk/res/img/enemy/13789.png
	new file:   trunk/res/img/enemy/13790.png
	new file:   trunk/res/img/enemy/13791.png
	new file:   trunk/res/img/enemy/13792.png
	new file:   trunk/res/img/enemy/13797.png
	new file:   trunk/res/img/enemy/13799.png
	new file:   trunk/res/img/enemy/20175.png
	new file:   trunk/res/img/enemy/20186.png
	new file:   trunk/res/img/enemy/32448.png
	new file:   trunk/res/img/enemy/32462.png
	new file:   trunk/res/img/enemy/32565.png
	new file:   trunk/res/img/junk/GameOver0.png
	new file:   trunk/res/img/junk/Title.png
	new file:   trunk/res/img/junk/Title0.png
	new file:   trunk/res/img/misc/13769.png
	new file:   trunk/res/img/misc/13775.png
	new file:   trunk/res/img/misc/20161.png
	new file:   trunk/res/img/misc/20174.png
	new file:   trunk/res/img/misc/20184.png
	new file:   trunk/res/img/misc/2286.png
	new file:   trunk/res/img/npc/20187.png
	new file:   trunk/res/img/npc/20188.png
	new file:   trunk/res/img/npc/20189.png
	new file:   trunk/res/img/npc/32510.png
	new file:   trunk/res/img/sfx/11988.png
	new file:   trunk/res/img/sfx/15037.png
	new file:   trunk/res/img/sfx/15038.png
	new file:   trunk/res/img/sfx/20001.png
	new file:   trunk/res/img/sfx/20002.png
	new file:   trunk/res/img/sfx/20003.png
	new file:   trunk/res/img/sfx/20004.png
	new file:   trunk/res/img/sfx/20160.png
	new file:   trunk/res/img/sfx/20170.png
	new file:   trunk/res/img/sfx/26938.png
	new file:   trunk/res/img/sfx/26939.png
	new file:   trunk/res/img/sfx/27019.png
	new file:   trunk/res/img/sfx/27021.png
	new file:   trunk/res/img/sfx/32370.gif
	new file:   trunk/res/img/sfx/32450.png
	new file:   trunk/res/img/sfx/32451.png
	new file:   trunk/res/img/sfx/32550.png
	new file:   trunk/res/img/sfx/32566.png
	new file:   trunk/res/img/sfx/32567.png
	new file:   trunk/res/img/sfx/37862.png
	new file:   trunk/res/img/sfx/40234.png
	new file:   trunk/res/img/sfx/45222.png
	new file:   trunk/res/img/sfx/45251.png
	new file:   trunk/res/img/sfx/5122.png
	new file:   trunk/res/img/sfx/54461.gif
	new file:   trunk/res/img/sfx/54596.png
	new file:   trunk/res/img/sfx/54692.png
	new file:   trunk/res/img/sfx/56172.png
	new file:   trunk/res/img/sfx/56173.png
	new file:   trunk/res/img/sfx/56185.png
	new file:   trunk/res/img/sfx/56197.png
	new file:   trunk/res/img/sfx/56200.png
	new file:   trunk/res/img/sfx/56202.png
	new file:   trunk/res/img/sfx/56435.png
	new file:   trunk/res/img/sfx/56457.png
	new file:   trunk/res/img/sfx/58847.png
	new file:   trunk/res/img/sfx/60900.png
	new file:   trunk/res/img/sfx/61893.png
	new file:   trunk/res/img/sfx/6651.png
	new file:   trunk/res/img/sfx/6669.png
	new file:   trunk/res/img/sfx/6705.png
	new file:   trunk/res/img/tileset/12898.png
	new file:   trunk/res/img/tileset/20163.png
	new file:   trunk/res/img/tileset/20167.png
	new file:   trunk/res/img/tileset/20178.png
	new file:   trunk/res/img/tileset/20185.png
	new file:   trunk/res/img/tileset/20194.png
	new file:   trunk/res/img/tileset/22862.png
	new file:   trunk/res/img/tileset/28546.png
	new file:   trunk/res/img/tileset/36708.png
	new file:   trunk/res/img/tileset/38054.png
	new file:   trunk/res/img/tileset/38986.png
	new file:   trunk/res/img/tileset/38994.png
	new file:   trunk/res/img/tileset/43481.png
	new file:   trunk/res/img/tileset/45187.png
	new file:   trunk/res/img/tileset/4596.png
	new file:   trunk/res/img/tileset/47646.png
	new file:   trunk/res/img/tileset/51099.png
	new file:   trunk/res/img/tileset/51115.png
	new file:   trunk/res/img/tileset/51162.png
	new file:   trunk/res/img/tileset/52198.png
	new file:   trunk/res/img/tileset/52688.png
	new file:   trunk/res/img/tileset/53622.png
	new file:   trunk/res/img/tileset/53633.png
	new file:   trunk/res/img/tileset/53637.png
	new file:   trunk/res/img/tileset/53646.png
	new file:   trunk/res/img/tileset/53653.png
	new file:   trunk/res/img/tileset/57510.png
	new file:   trunk/res/img/tileset/58972.png
	new file:   trunk/res/img/tileset/6211.png
	new file:   trunk/src/anim.cpp
	new file:   trunk/src/anim.h
	new file:   trunk/src/animcollection.cpp
	new file:   trunk/src/animcollection.h
	new file:   trunk/src/animstrip.cpp
	new file:   trunk/src/animstrip.h
	new file:   trunk/src/deployment.pri
	new file:   trunk/src/editor/editor.pro
	new file:   trunk/src/editor/editor.pro.user
	new file:   trunk/src/editor/main.cpp
	new file:   trunk/src/editor/mainwindow.cpp
	new file:   trunk/src/editor/mainwindow.h
	new file:   trunk/src/editor/mainwindow.ui
	new file:   trunk/src/m0sh.pro
	new file:   trunk/src/m0sh.pro.user
	new file:   trunk/src/main.cpp
	new file:   trunk/src/overworld.cpp
	new file:   trunk/src/overworld.h
	new file:   trunk/src/particle.cpp
	new file:   trunk/src/particle.h
	new file:   trunk/src/particleemitter.cpp
	new file:   trunk/src/particleemitter.h
	new file:   trunk/src/particlemanipulator.cpp
	new file:   trunk/src/particlemanipulator.h
	new file:   trunk/src/scene.cpp
	new file:   trunk/src/scene.h
	new file:   trunk/src/scenemanager.cpp
	new file:   trunk/src/scenemanager.h
	new file:   trunk/src/session.cpp
	new file:   trunk/src/session.h
	new file:   trunk/src/spriteex.cpp
	new file:   trunk/src/spriteex.h
	new file:   trunk/src/stage.cpp
	new file:   trunk/src/stage.h
	new file:   trunk/src/uiwidget.cpp
	new file:   trunk/src/uiwidget.h