]> git.mxchange.org Git - flightgear.git/commit
Merge commit 'refs/merge-requests/1552' of git@gitorious.org:fg/flightgear into next
authorCsaba Halasz <Csaba.Halasz@gmail.com>
Wed, 8 Sep 2010 22:48:17 +0000 (00:48 +0200)
committerCsaba Halasz <Csaba.Halasz@gmail.com>
Wed, 8 Sep 2010 22:48:17 +0000 (00:48 +0200)
commitfdbfd6fd0b789eecf2c532d048a75d15f8d35ad8
treec8bbf2cf2b04a8fb899b2ff18145d9dedad09c98
parent7227973e2fc493f82e1477ba82e3e8aa956b23ef
parent2cdc9f64610396059f6f5840c8288ef8c58a10ac
Merge commit 'refs/merge-requests/1552' of git@gitorious.org:fg/flightgear into next

Conflicts:

src/MultiPlayer/multiplaymgr.cxx
src/AIModel/AIEscort.cxx
src/AIModel/AIEscort.hxx
src/AIModel/AIGroundVehicle.hxx
src/MultiPlayer/multiplaymgr.cxx