Merge remote-tracking branch 'origin/telemini'
authorKeith Packard <keithp@keithp.com>
Thu, 29 Aug 2013 04:52:58 +0000 (22:52 -0600)
committerKeith Packard <keithp@keithp.com>
Thu, 29 Aug 2013 04:52:58 +0000 (22:52 -0600)
commitdcc51bb18985c24fa35bce0dd42ea3d847b960bf
tree652c06c900b01b3c43f674e0f121109cc54b1120
parent7c82acc1c1c5b7b4da7c7ecb3b2fd90140e4c703
parenta73b02518fcbc9fc0807ed8e141d3a06e8ad8214
Merge remote-tracking branch 'origin/telemini'

Signed-off-by: Keith Packard <keithp@keithp.com>
Conflicts:
src/core/ao_telemetry.c
src/core/ao_telemetry.h

Added both Mini and Metrum telemetry defines
src/core/ao_data.h
src/core/ao_task.c
src/core/ao_telemetry.c
src/core/ao_telemetry.h