Merge branch 'bugfixes'
authorautomerge <cron@wz2100.net>
Fri, 8 Jun 2012 06:00:11 +0000 (08:00 +0200)
committercybersphinx <chr.ohm@gmx.net>
Fri, 8 Jun 2012 06:00:11 +0000 (08:00 +0200)
commit7107400b2b3b5761b96fa97fffddcb8a2383a77a
tree7d310418e5bd16e35cd55812907fd992279f77a3
parent803e9b27a440568612e889dabea6eb186a90da44
parent64951d6f128c6a3db01b1705a462f4f632bcf2af
Merge branch 'bugfixes'
src/action.cpp
src/display.cpp
src/droid.cpp
src/droid.h
src/game.cpp
src/hci.cpp
src/structure.cpp
src/visibility.cpp