Merge branch 'sitemap' into buttonbox
authorAnthony Towns <aj@erisian.com.au>
Sun, 21 Nov 2010 01:15:02 +0000 (11:15 +1000)
committerAnthony Towns <aj@erisian.com.au>
Sun, 21 Nov 2010 01:15:02 +0000 (11:15 +1000)
commit835b903727a2eabda8d9659cc46e53301f92897c
tree7853fb259f03477068f183e07772aa05cd855bb4
parent440a0f3f5130eb0c8e614691892be8c94e7fd3c3
parent878913551a1e4e3c8f2b39fa4aeb234880735a1c
Merge branch 'sitemap' into buttonbox

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