Merge remote branch 'aj/sitemap' into buttonbox
authorKeith Packard <keithp@keithp.com>
Sun, 21 Nov 2010 00:35:48 +0000 (16:35 -0800)
committerKeith Packard <keithp@keithp.com>
Sun, 21 Nov 2010 00:35:48 +0000 (16:35 -0800)
commit8df185cd95cfecbed8272dd1275d077c5b45535b
tree00c4f1c40233977b9548c6067b0f0fad452642de
parentece2c86e2641b2cd613791293526c492b1606aa1
parent1e712647dd6df1e77650db705f3ac32a3c8f6907
Merge remote branch 'aj/sitemap' into buttonbox

Conflicts:
ao-tools/altosui/AltosFlightUI.java

Signed-off-by: Keith Packard <keithp@keithp.com>
ao-tools/altosui/AltosFlightUI.java
ao-tools/altosui/AltosInfoTable.java
ao-tools/altosui/AltosSiteMap.java
ao-tools/altosui/AltosSiteMapCache.java
ao-tools/altosui/AltosSiteMapTile.java