Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
authorAnthony Towns <aj@erisian.com.au>
Wed, 17 Nov 2010 19:54:06 +0000 (05:54 +1000)
committerAnthony Towns <aj@erisian.com.au>
Wed, 17 Nov 2010 19:54:06 +0000 (05:54 +1000)
commit939be6793238a275b7682ecc376fed14379cf044
treef05feaf2572cccd5eb1e8565b70fc6948f607194
parente68fe9454352087889c560d95797922493117acb
parent1a4b6e96f823035b113f01d1bdfd61afc1f33e25
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox

Conflicts:
ao-tools/altosui/AltosFlightUI.java
ao-tools/altosui/AltosFlightUI.java
ao-tools/altosui/AltosInfoTable.java
ao-tools/altosui/Makefile.am