Merge commit 'upstream/0.7-beta'
authorChris Butler <chrisb@debian.org>
Thu, 23 Jun 2011 20:33:57 +0000 (21:33 +0100)
committerChris Butler <chrisb@debian.org>
Thu, 23 Jun 2011 20:33:57 +0000 (21:33 +0100)
commitb4c6bd77e3f8f273951a36f67c13a224ef4aa933
treee905025a10b277c1cd9b9404fbdc8690bd6f17e7
parent6f8a7c8637d9e9f7ac09f7553ca631303170c088
parented620f20e58457e0ff9a52bca81f92d60650e258
Merge commit 'upstream/0.7-beta'

Conflicts:
.gitignore
CorsixTH/Levels/original07.level
CorsixTH/Lua/languages/russian.lua
CorsixTH/Lua/research_department.lua
CorsixTH/Lua/string_extensions.lua
CorsixTH/Src/cp437_table.h
CorsixTH/Src/cp936_table.h
CorsixTH/Src/th_gfx_font.cpp
CorsixTH/Src/th_gfx_font.h
DebianPackage/control
DebianPackage/usr/share/applications/CorsixTH.desktop
DebianPackage/usr/share/applications/MapEdit.desktop