[paparazzi-commits] [paparazzi/paparazzi] 7a955f: Fixed merge problem, cleaned up and added to contr...

[GitHub]

  Branch: refs/heads/fix_pyhton_tools
  Home:   https://github.com/paparazzi/paparazzi
  Commit: 7a955f3e36c12b88f69b1db906ce01da00fb4bd9
      
https://github.com/paparazzi/paparazzi/commit/7a955f3e36c12b88f69b1db906ce01da00fb4bd9
  Author: Christophe De Wagter <address@hidden>
  Date:   2018-10-05 (Fri, 05 Oct 2018)

  Changed paths:
    M conf/control_panel_example.xml
    M conf/userconf/tudelft/control_panel.xml
    M sw/ground_segment/python/atc/atc_frame.py

  Log Message:
  -----------
  Fixed merge problem, cleaned up and added to controlpanel



      **NOTE:** This service has been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.