paparazzi-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[paparazzi-commits] [paparazzi/paparazzi] a68ac2: Remove files to solve

From: GitHub
Subject: [paparazzi-commits] [paparazzi/paparazzi] a68ac2: Remove files to solve continuous merge conflicts: ...
Date: Mon, 05 Mar 2012 05:32:21 -0800 
  Branch: refs/heads/master
  Home:   https://github.com/paparazzi/paparazzi
  Commit: a68ac23d3a7783de9c66bd8e586e7ca9cd5c62c2
      
https://github.com/paparazzi/paparazzi/commit/a68ac23d3a7783de9c66bd8e586e7ca9cd5c62c2
  Author: Christophe De Wagter <address@hidden>
  Date:   2012-03-05 (Mon, 05 Mar 2012)

  Changed paths:
    A conf/airframes/CDW/LisaAspirin2.xml
  A conf/airframes/CDW/yapa3_aspirin2.xml
  R conf/airframes/TU_Delft/EasyStartPanTiltCHIMU_SPI.xml
  R conf/airframes/TU_Delft/MicrojetBR.xml
  R conf/airframes/TU_Delft/MicrojetBRimu.xml
  R conf/airframes/TU_Delft/MicrojetCDW.xml
  R conf/airframes/TU_Delft/Trip50A.xml
  R conf/airframes/TU_Delft/Trip50B.xml
  R conf/airframes/TU_Delft/holiday50.xml
  R conf/airframes/TU_Delft/skywalker.xml
  R conf/airframes/TU_Delft/skywalkerfiber.xml
  R conf/airframes/TU_Delft/yapa_xsens.xml

  Log Message:
  -----------
  Remove files to solve continuous merge conflicts: please refer to 
tudelft/paparazzi for updated airframe files
reply via email to
[Prev in Thread] Current Thread [Next in Thread]