Sambas
|
147100bc2f
|
Merge remote-tracking branch 'remotes/origin/revo-next' into osd_test_v1
Conflicts:
Makefile
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
|
2012-05-28 19:06:25 +03:00 |
|
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
|
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
|
ee2b12b917
|
Updates
|
2012-03-10 09:40:37 +02:00 |
|
Sambas
|
8e31f84058
|
V1 beta
|
2012-02-28 20:32:44 +02:00 |
|
Sambas
|
ebd2ae7e59
|
Bootloader, copy from revo, not functional
|
2012-02-18 22:35:13 +02:00 |
|
Sambas
|
8cc876d02a
|
OSD branch
|
2012-02-12 22:29:42 +02:00 |
|