Merge branch 'prefs_interface' into altosdroid

author Mike Beattie <mike@ethernal.org>

Sun, 16 Sep 2012 10:27:04 +0000 (22:27 +1200)

committer Mike Beattie <mike@ethernal.org>

Sun, 16 Sep 2012 10:27:04 +0000 (22:27 +1200)
author Mike Beattie <mike@ethernal.org>
Sun, 16 Sep 2012 10:27:04 +0000 (22:27 +1200)
committer Mike Beattie <mike@ethernal.org>
Sun, 16 Sep 2012 10:27:04 +0000 (22:27 +1200)
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	Mike Beattie <mike@ethernal.org>
	Sun, 16 Sep 2012 10:27:04 +0000 (22:27 +1200)
committer	Mike Beattie <mike@ethernal.org>
	Sun, 16 Sep 2012 10:27:04 +0000 (22:27 +1200)
		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