pre flight01

paparazzi · Apr 1, 2017 · 8b803b1 · 8b803b1
1 parent ea96621
commit 8b803b1
Show file tree

Hide file tree

Showing 4 changed files with 627 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -56,10 +56,10 @@ paparazzi.sublime-workspace
 /paparazzi
 
 # /conf/
-/conf/conf.xml
+/conf/conf.xml~
 /conf/conf.xml.20*
 /conf/conf_personal.xml.20*
-/conf/control_panel.xml
+/conf/control_panel.xml~
 /conf/control_panel.xml.20*
 /conf/%gconf.xml
 /conf/maps_data/*

diff --git a/conf/conf.xml b/conf/conf.xml
@@ -0,0 +1 @@
+userconf/OPENUAS/openuas_conf.xml