Richard Flay (Hyper)
|
87fcf9fa8b
|
Merge branch 'next' into hyper/OP-931_extra_compiler_warnings and update as necessary.
Hopefully properly fixes conflicts:
flight/modules/Attitude/attitude.c
flight/modules/ManualControl/manualcontrol.c
flight/modules/Osd/WavPlayer/wavplayer.c
flight/modules/Osd/osdgen/osdgen.c
flight/modules/System/systemmod.c
ground/uavobjgenerator/generators/flight/uavobjectgeneratorflight.cpp
|
2013-05-04 11:12:44 +09:30 |
|
sambas
|
38d9d5dde3
|
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
Conflicts:
flight/modules/VtolPathFollower/vtolpathfollower.c
|
2013-04-28 09:46:14 +03:00 |
|
Richard Flay (Hyper)
|
80c917591e
|
Cherry-pick and hand-merge of Sami's math cleanup commit from branch sambas/diffnext: 5f3e0c3e1da9388ca7572a5cb97d67a002dc0360
|
2013-04-28 10:45:28 +09:30 |
|
sambas
|
5f3e0c3e1d
|
Math cleanup
|
2013-04-27 16:30:02 +03:00 |
|
Oleg Semyonov
|
e2fd821e97
|
Merge remote-tracking branch 'origin/next' into sambas/diffnext
Conflicts:
make/common-defs.mk
|
2013-04-26 16:31:19 +03:00 |
|
Oleg Semyonov
|
66db978244
|
Rename Libraries->libraries, Modules->modules
|
2013-04-25 13:13:36 +03:00 |
|