]> git.mxchange.org Git - flightgear.git/commitdiff
projects / flightgear.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6251814 c71fcbf)
Merge commit 'refs/merge-requests/7' of git://gitorious.org/fg/flightgear into topics...
authorJames Turner <zakalawe@mac.com>
Tue, 19 Oct 2010 08:05:51 +0000 (09:05 +0100)
committerJames Turner <zakalawe@mac.com>
Tue, 19 Oct 2010 08:05:51 +0000 (09:05 +0100)
1  2 
src/MultiPlayer/multiplaymgr.cxx patch | diff1 | diff2 | blob | history
src/Network/generic.cxx patch | diff1 | diff2 | blob | history

diff --cc src/MultiPlayer/multiplaymgr.cxx
Simple merge
diff --cc src/Network/generic.cxx
Simple merge
Personal clone of the FlightGear source code, the free-libre OpenSource flight simulator.