From: Anthony Towns <aj@erisian.com.au>
Date: Sat, 20 Nov 2010 07:40:49 +0000 (+1000)
Subject: Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
X-Git-Tag: debian/0.7.1+117+ge7954c8~8^2~11
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=081fbd5715f9d3d81d98e149fb95d40447c07a79;hp=081fbd5715f9d3d81d98e149fb95d40447c07a79

Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox

Conflicts:
	ao-tools/altosui/AltosFlightUI.java
---