Merge branch 'bugfixes'. Kept master fix for stored template filenames.
authorPer Inge Mathisen <per@wz2100.net>
Fri, 26 Oct 2012 22:19:18 +0000 (00:19 +0200)
committerPer Inge Mathisen <per@wz2100.net>
Fri, 26 Oct 2012 22:19:18 +0000 (00:19 +0200)
commit41738d947c46ef2d48351aadd9c2c228a8d847e6
treedbf102cde4d64ec6d9009a214ead47d3d759fa02
parent9356cc13d3befa7e35eacd6366cf5a1710f395b8
parent647f5ed23682f650fad1f23ced693a24258ac7dc
Merge branch 'bugfixes'. Kept master fix for stored template filenames.

Conflicts:
src/intdisplay.cpp
src/multiint.cpp
src/template.cpp
tools/map/mapload.cpp
src/display3d.cpp
src/game.cpp
src/intdisplay.cpp
src/multiint.cpp
src/qtscriptfuncs.cpp
src/research.cpp
src/template.cpp
tests/modeltest.c
tests/qtscripttest.cpp
tools/map/mapload.cpp