Alessio Morale 742ea6f6b8 Merge branch 'amorale/OP-905_revolution_watchdog' into next ...

Conflicts:
	flight/targets/RevoMini/System/pios_board.c

2013-05-14 18:42:02 +02:00

..

libraries

OP-936: Merges branch 'next' into hyper/OP-936_task-monitor-rework, fixes damage/conflicts,

2013-05-06 19:11:14 +09:30

modules

Merge branch 'amorale/OP-938_ah_improvements' into next

2013-05-13 23:30:46 +02:00

pios

logfs: fix unit tests (requires MIN declaration from pios_math.h)

2013-05-12 03:51:00 +03:00

Project

Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext

2013-05-02 09:00:12 +03:00

targets

Merge branch 'amorale/OP-905_revolution_watchdog' into next

2013-05-14 18:42:02 +02:00

tests/logfs

Fix broken unit tests

2013-05-03 20:27:03 +02:00

uavobjects

OP-936: Merges branch 'next' into hyper/OP-936_task-monitor-rework, fixes damage/conflicts,

2013-05-06 19:11:14 +09:30

uavtalk

OP-931: adds -Wextra compiler option for the flight code, and makes the bazillion code changes required

2013-05-05 16:32:24 +09:30

.gitattributes

Update flight/.gitattributes to include *.template files

2013-04-30 22:15:58 +02:00