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

[paparazzi-commits] [paparazzi/paparazzi] 0c4ef5: move out of in_progres

From: noreply
Subject: [paparazzi-commits] [paparazzi/paparazzi] 0c4ef5: move out of in_progress
Date: Sun, 28 Nov 2010 03:29:32 -0800 
Branch: refs/heads/master
Home:   https://github.com/paparazzi/paparazzi

Commit: 0c4ef5af65b97b827c25c2ca91262d9179b69eec
    
https://github.com/paparazzi/paparazzi/commit/0c4ef5af65b97b827c25c2ca91262d9179b69eec
Author: MarkGriffin <address@hidden>
Date:   2010-11-28 (Sun, 28 Nov 2010)

Changed paths:
  R sw/in_progress/antenna_track/Makefile
  R sw/in_progress/antenna_track/ant_track_pmm.c

Log Message:
-----------
move out of in_progress


Commit: 9798e0b6398c0fb686ae63a1ae81935546ac19ca
    
https://github.com/paparazzi/paparazzi/commit/9798e0b6398c0fb686ae63a1ae81935546ac19ca
Author: MarkGriffin <address@hidden>
Date:   2010-11-28 (Sun, 28 Nov 2010)

Changed paths:
  M Makefile
  M conf/Makefile.lpc21
  M sw/airborne/arch/lpc21/lpcusb/Makefile
  M sw/ground_segment/cockpit/Makefile
  A sw/ground_segment/cockpit/ant_track_pmm.c

Log Message:
-----------
Merge branch 'master' of git://github.com/paparazzi/paparazzi

Conflicts:
        sw/in_progress/antenna_track/Makefile
        sw/in_progress/antenna_track/ant_track_pmm.c
reply via email to
[Prev in Thread] Current Thread [Next in Thread]