Sambas
|
7c06c0ed93
|
Merge remote-tracking branch 'remotes/origin/sambas/osd_test' into osd_test_v1
Conflicts:
flight/Modules/Osd/osdgen/osdgen.c
flight/OSD/Makefile
flight/OSD/System/pios_board.c
flight/board_hw_defs/osd/board_hw_defs.c
make/boards/osd/board-info.mk
|
2012-03-11 11:58:06 +02:00 |
|
Sambas
|
cb442f0481
|
Merge remote-tracking branch 'remotes/origin/sambas/osd_test' into osd_test_v1
Conflicts:
flight/Modules/Osd/osdgen/osdgen.c
flight/OSD/Makefile
flight/PiOS/Common/pios_video.c
shared/uavobjectdefinition/osdsettings.xml
|
2012-03-11 11:39:29 +02:00 |
|
Sambas
|
addda5f29d
|
USB and bootloader stuff, WORKS!!
|
2012-03-11 11:31:02 +02:00 |
|
Sambas
|
ccf5c310c9
|
Updates
|
2012-03-11 09:27:38 +02:00 |
|
Sambas
|
91a9e45888
|
Updates, first UAVtalk client test
|
2012-03-05 19:53:52 +02:00 |
|
Sambas
|
8e31f84058
|
V1 beta
|
2012-02-28 20:32:44 +02:00 |
|
Sambas
|
8f45114b1f
|
Fixes & cleanup
|
2012-02-15 21:14:02 +02:00 |
|
Sambas
|
0bc08a48d8
|
cleanup 'n' updates
|
2012-02-14 21:42:09 +02:00 |
|
Sambas
|
8cc876d02a
|
OSD branch
|
2012-02-12 22:29:42 +02:00 |
|