]> git.mxchange.org Git - flightgear.git/commit
Merge branch 'work4' into next
authorVivian Meazza <vivian.meazza@lineone.net>
Wed, 28 Jul 2010 21:39:07 +0000 (22:39 +0100)
committerVivian Meazza <vivian.meazza@lineone.net>
Wed, 28 Jul 2010 21:39:07 +0000 (22:39 +0100)
commita61f34667fdb43198f707e719f56f5bbaf2fb7b5
tree75f5a7b33f76835a8592f7007798076aac9e353f
parentd1852430bfc4932be153c78c65d3d849c9e5ede9
parentda8251d1a4a597d11d2c1f3f7332d81ba8a73223
Merge branch 'work4' into next

Conflicts:
src/Environment/environment_mgr.cxx

Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
src/Environment/environment_mgr.cxx