Merge remote-tracking branch 'mjb/altosui_mjb'

author Keith Packard <keithp@keithp.com>

Thu, 20 Sep 2012 09:29:55 +0000 (11:29 +0200)

committer Keith Packard <keithp@keithp.com>

Thu, 20 Sep 2012 09:29:55 +0000 (11:29 +0200)
author Keith Packard <keithp@keithp.com>
Thu, 20 Sep 2012 09:29:55 +0000 (11:29 +0200)
committer Keith Packard <keithp@keithp.com>
Thu, 20 Sep 2012 09:29:55 +0000 (11:29 +0200)
diff --cc altosui/AltosAscent.java
Simple merge
diff --cc altosui/AltosDescent.java
Simple merge
diff --cc altosui/AltosKML.java
Simple merge
diff --cc altosui/AltosLanded.java
Simple merge
diff --cc altosui/AltosPad.java
Simple merge
author	Keith Packard <keithp@keithp.com>
	Thu, 20 Sep 2012 09:29:55 +0000 (11:29 +0200)
committer	Keith Packard <keithp@keithp.com>
	Thu, 20 Sep 2012 09:29:55 +0000 (11:29 +0200)
		1	2
altosui/AltosAscent.java	patch \|	diff1 \|	diff2 \|	blob \| history
altosui/AltosDescent.java	patch \|	diff1 \|	diff2 \|	blob \| history
altosui/AltosKML.java	patch \|	diff1 \|	diff2 \|	blob \| history
altosui/AltosLanded.java	patch \|	diff1 \|	diff2 \|	blob \| history
altosui/AltosPad.java	patch \|	diff1 \|	diff2 \|	blob \| history