[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [paparazzi/paparazzi] 9b351d: fix remains of conflic
|
From: |
noreply |
|
Subject: |
[paparazzi-commits] [paparazzi/paparazzi] 9b351d: fix remains of conflict in stabilization_attitude |
|
Date: |
Wed, 17 Aug 2011 11:25:00 -0700 |
Branch: refs/heads/dev
Home: https://github.com/paparazzi/paparazzi
Commit: 9b351df8de6f142725eb0e261c79e6a4af04d12c
https://github.com/paparazzi/paparazzi/commit/9b351df8de6f142725eb0e261c79e6a4af04d12c
Author: Felix Ruess <address@hidden>
Date: 2011-08-17 (Wed, 17 Aug 2011)
Changed paths:
M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
Log Message:
-----------
fix remains of conflict in stabilization_attitude