Merge branch 'master' into stm-flash
authorKeith Packard <keithp@keithp.com>
Mon, 22 Apr 2013 22:20:51 +0000 (17:20 -0500)
committerKeith Packard <keithp@keithp.com>
Mon, 22 Apr 2013 22:20:51 +0000 (17:20 -0500)
commit33c3b2c57d0d4285b75d4dcf7ca67ad19da08c86
treea9ff47afab29fe141dcd1da0ca276b367f911cb6
parent1a84db819a359be39be51c9105039ab28c9fc894
parent90b0db1ae53182c94bf12d661446fc369d916366
Merge branch 'master' into stm-flash

Conflicts:
ao-tools/ao-stmload/ao-stmload.c
altoslib/Makefile.am
altosui/Makefile.am
ao-tools/lib/cc-usb.c
src/core/ao.h
src/stm/Makefile.defs
src/telebt-v1.0/ao_telebt.c