Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
authorAnthony Towns <aj@erisian.com.au>
Sat, 20 Nov 2010 07:40:49 +0000 (17:40 +1000)
committerAnthony Towns <aj@erisian.com.au>
Sat, 20 Nov 2010 07:40:49 +0000 (17:40 +1000)
commit081fbd5715f9d3d81d98e149fb95d40447c07a79
tree073885e98179ef663f08aaaf52cb7e74c2c66427
parent90b9bc4475011bead7117ed72fa5efa0f77b2813
parent7920ed5c34b088f45ce4213b061ddd1ffe22cee8
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/Makefile.am