]> git.mxchange.org Git - flightgear.git/commit
projects / flightgear.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d7440d8 d61e992)
Merge commit 'refs/merge-requests/9' of git://gitorious.org/fg/flightgear into integr...
authorJames Turner <zakalawe@mac.com>
Mon, 25 Oct 2010 08:12:21 +0000 (09:12 +0100)
committerJames Turner <zakalawe@mac.com>
Mon, 25 Oct 2010 08:12:21 +0000 (09:12 +0100)
commite5abcb1d4ebc987cce695df854465c0b6563f994
treed5b218a8941dee6bfce7cb995acceae6cab70a21tree | snapshot
parentd7440d8fc529f6efaa03e65d886943543b0351cccommit | diff
parentd61e992d765f0b7c59c74e8cb0d6004d5f2e596dcommit | diff
Merge commit 'refs/merge-requests/9' of git://gitorious.org/fg/flightgear into integration/merge9

Conflicts:
src/GUI/new_gui.cxx
src/GUI/new_gui.cxx diff1 | diff2 | blob | history
Personal clone of the FlightGear source code, the free-libre OpenSource flight simulator.