Merge branch 'jmt/gps'

author Tim Moore <timoore@redhat.com>

Fri, 27 Nov 2009 05:40:47 +0000 (06:40 +0100)

committer Tim Moore <timoore@redhat.com>

Fri, 27 Nov 2009 05:40:47 +0000 (06:40 +0100)
author Tim Moore <timoore@redhat.com>
Fri, 27 Nov 2009 05:40:47 +0000 (06:40 +0100)
committer Tim Moore <timoore@redhat.com>
Fri, 27 Nov 2009 05:40:47 +0000 (06:40 +0100)
diff --cc src/AIModel/AIFlightPlanCreateCruise.cxx

index 4f44ab1e25d3d160574ceef01bc09ab8e39306b9,d20a2134be25c086e7ac21b538d03a0744f5b61f..d20a2134be25c086e7ac21b538d03a0744f5b61f

mode 100644,100755..100644
--- 1/src/AIModel/AIFlightPlanCreateCruise.cxx
--- 2/src/AIModel/AIFlightPlanCreateCruise.cxx
+++ b/src/AIModel/AIFlightPlanCreateCruise.cxx
diff --cc src/Airports/simple.cxx
Simple merge
diff --cc src/Cockpit/hud.cxx
Simple merge
diff --cc src/Environment/environment_ctrl.cxx
Simple merge
diff --cc src/Instrumentation/navradio.cxx
Simple merge
diff --cc src/Instrumentation/navradio.hxx
Simple merge
author	Tim Moore <timoore@redhat.com>
	Fri, 27 Nov 2009 05:40:47 +0000 (06:40 +0100)
committer	Tim Moore <timoore@redhat.com>
	Fri, 27 Nov 2009 05:40:47 +0000 (06:40 +0100)
		1	2
src/AIModel/AIFlightPlanCreateCruise.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/Airports/simple.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/Cockpit/hud.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/Environment/environment_ctrl.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/Instrumentation/navradio.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/Instrumentation/navradio.hxx	patch \|	diff1 \|	diff2 \|	blob \| history