]> git.mxchange.org Git - flightgear.git/commit
Merge branch 'next' of git://gitorious.org/fg/flightgear
authorStuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Thu, 21 Apr 2011 19:55:49 +0000 (20:55 +0100)
committerStuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Thu, 21 Apr 2011 19:55:49 +0000 (20:55 +0100)
commit0becb0df2b3364f92bdcad5b9bfd3f87a1649f06
treec7f4bb42c504441110dc2d0e084dfd7e3ef9780b
parent38af5a2a072f8cb218612df6347a22686a9cf022
parentaae1b5494fc19430da86a2385d297d9c84836a35
Merge branch 'next' of git://gitorious.org/fg/flightgear

Conflicts:
src/Environment/environment_mgr.cxx
src/Environment/environment_mgr.cxx