Merge branch 'bugfixes'
authorCyp <cyp@wz2100.net>
Fri, 4 May 2012 11:43:54 +0000 (13:43 +0200)
committerCyp <cyp@wz2100.net>
Fri, 4 May 2012 11:43:54 +0000 (13:43 +0200)
commita3134ae4c4bd4bd857ff22259dc5365b544ad445
tree82c5cbf8dd604c3a73c14b0dc7c4bc09a838dd90
parent1fb55c6fdadb2aad713b348ecab8e4c6e57cc21a
parentca736e71af9e2444ae0133a19214f27db456e9a2
Merge branch 'bugfixes'

Conflicts:
src/action.cpp
src/action.cpp
src/ai.cpp
src/display3d.cpp
src/structure.cpp
src/structure.h