Merge branch 'buttonbox' into sitemap
authorAnthony Towns <aj@erisian.com.au>
Sun, 21 Nov 2010 00:45:15 +0000 (10:45 +1000)
committerAnthony Towns <aj@erisian.com.au>
Sun, 21 Nov 2010 00:45:15 +0000 (10:45 +1000)
commit2a7dc3ba36bac81640a9498e0d0caf1470b57c19
tree49e5687e40aa4a37a5479d831a0cb18ad6c14362
parente5b1adae9b23b98a6321986f5cd67c9d3166b87f
parentece2c86e2641b2cd613791293526c492b1606aa1
Merge branch 'buttonbox' into sitemap

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