]> git.mxchange.org Git - flightgear.git/commit
Merge branch 'next' of D:\Git_New\flightgear into next
authorVivian Meazza <vivian.meazza@lineone.net>
Sat, 28 Aug 2010 23:08:50 +0000 (00:08 +0100)
committerVivian Meazza <vivian.meazza@lineone.net>
Sat, 28 Aug 2010 23:08:50 +0000 (00:08 +0100)
commit9e44be1df7d01515c1dc4a2cda9e340d00c4b887
treef6f21017d8c3c5a0a5f3736458a16dd196f55dca
parentdff8099994e9205d0790aaf91e3a6a9795150e74
parentc41364983e4bed149efa6bd00ae1b9f18e7d985b
Merge branch 'next' of D:\Git_New\flightgear into next

Conflicts:
src/AIModel/AIBallistic.cxx
src/AIModel/AIBallistic.cxx
src/AIModel/AIBallistic.hxx
src/AIModel/AIBase.cxx
src/AIModel/AIBase.hxx
src/AIModel/AIManager.cxx
src/AIModel/AIWingman.cxx
src/AIModel/submodel.cxx
src/AIModel/submodel.hxx
src/Environment/environment_mgr.cxx