]> git.mxchange.org Git - flightgear.git/commit
Merge branch 'next' into vivian
authorCsaba Halasz <Csaba.Halasz@gmail.com>
Wed, 29 Sep 2010 22:45:13 +0000 (00:45 +0200)
committerCsaba Halasz <Csaba.Halasz@gmail.com>
Wed, 29 Sep 2010 22:45:13 +0000 (00:45 +0200)
commit141186a358d07141eac151c287761eed6d81b68c
treefb69c2c145a1ebe3280445ee4cf14df7310ab417
parent10866851de802979af4a5857aa795d0b4a90b0c5
parent5ed04a6227273c57d18f719f0bafb5009ec5792c
Merge branch 'next' into vivian

Conflicts:

src/AIModel/AIBallistic.cxx
src/AIModel/AIBase.cxx
src/AIModel/AIBallistic.cxx
src/AIModel/AIBase.cxx
src/AIModel/AIEscort.cxx