From d04b8fecfbb5fbda30d85a7fd1a74c0d9b0c2027 Mon Sep 17 00:00:00 2001
From: Fredrik Larsson <hayvosh@openpilot.org>
Date: Mon, 8 Sep 2014 18:23:03 +1000
Subject: [PATCH] Update gitignore to make sure we keep that pro.user out of
 git

---
 .gitignore | 145 +++++++++++++++++++++++++++--------------------------
 1 file changed, 73 insertions(+), 72 deletions(-)

diff --git a/.gitignore b/.gitignore
index b2583f3b1..bab962c2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,72 +1,73 @@
-# Ignore artifacts of top-level Makefile
-/downloads
-/tools
-/build
-
-# Exclude temporary and system files
-Thumbs.db
-.DS_Store
-GPATH
-GRTAGS
-GSYMS
-GTAGS
-core
-
-# flight
-/flight/*.pnproj
-/flight/*.pnps
-/flight/.cproject
-/flight/.metadata
-/flight/.project
-/flight/.settings
-/flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/*.mode1v3
-/flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/*.pbxuser
-
-# ground
-openpilotgcs-build-desktop
-ground/openpilotgcs/.cproject
-ground/openpilotgcs/.project
-ground/openpilotgcs/.settings
-
-# Ignore some of the .pro.user files
-*.pro.user
-/ground/openpilotgcs/openpilotgcs.pro.user
-/ground/uavobjgenerator/uavobjgenerator.pro.user
-/ground/uavobjects/uavobjects.pro.user
-/ground/ground.pro.user
-
-# Misc artifacts
-/ground/openpilotgcs/share/openpilotgcs/sounds/normalize.exe
-/ground/openpilotgcs/share/openpilotgcs/sounds/default/normalize.exe
-/ground/openpilotgcs/share/openpilotgcs/translations/extract-mimetypes.xq
-/ground/openpilotgcs/src/experimental/tools/DocumentationHelper/ui_mainwindow.h
-/ground/openpilotgcs/src/libs/qextserialport/.hg
-/ground/openpilotgcs/src/libs/qextserialport/.hgtags
-/ground/openpilotgcs/src/libs/qwt/qwt.prf
-/ground/openpilotgcs/src/libs/qwt/designer
-/ground/openpilotgcs/src/plugins/ipconnection/ui_ipconnectionoptionspage.h
-
-# Ignore intermediate files generated by command-line android builds
-# Couldn't figure out how to force these files into the ./build directory
-/androidgcs/build.xml
-/androidgcs/local.properties
-/androidgcs/proguard-project.txt
-
-# Ignore build output from Eclipse android builds
-/androidgcs/bin/
-/androidgcs/gen/
-
-# Ignore Eclipse Projects and Metadata
-/.cproject
-/.project
-/.metadata
-/.settings
-/.pydevproject
-
-# Ignore Eclipse temp folder, git plugin based?
-RemoteSystemsTempFiles
-
-# Ignore patch-related files
-*.rej
-*.orig
-*.diff~
+# Ignore artifacts of top-level Makefile
+/downloads
+/tools
+/build
+
+# Exclude temporary and system files
+Thumbs.db
+.DS_Store
+GPATH
+GRTAGS
+GSYMS
+GTAGS
+core
+
+# flight
+/flight/*.pnproj
+/flight/*.pnps
+/flight/.cproject
+/flight/.metadata
+/flight/.project
+/flight/.settings
+/flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/*.mode1v3
+/flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/*.pbxuser
+
+# ground
+openpilotgcs-build-desktop
+ground/openpilotgcs/.cproject
+ground/openpilotgcs/.project
+ground/openpilotgcs/.settings
+
+# Ignore some of the .pro.user files
+*.pro.user
+/ground/openpilotgcs/openpilotgcs.pro.user
+/ground/uavobjgenerator/uavobjgenerator.pro.user
+/ground/uavobjects/uavobjects.pro.user
+/ground/ground.pro.user
+/ground/openpilotgcs/src/libs/sdlgamepad.pro.user
+
+# Misc artifacts
+/ground/openpilotgcs/share/openpilotgcs/sounds/normalize.exe
+/ground/openpilotgcs/share/openpilotgcs/sounds/default/normalize.exe
+/ground/openpilotgcs/share/openpilotgcs/translations/extract-mimetypes.xq
+/ground/openpilotgcs/src/experimental/tools/DocumentationHelper/ui_mainwindow.h
+/ground/openpilotgcs/src/libs/qextserialport/.hg
+/ground/openpilotgcs/src/libs/qextserialport/.hgtags
+/ground/openpilotgcs/src/libs/qwt/qwt.prf
+/ground/openpilotgcs/src/libs/qwt/designer
+/ground/openpilotgcs/src/plugins/ipconnection/ui_ipconnectionoptionspage.h
+
+# Ignore intermediate files generated by command-line android builds
+# Couldn't figure out how to force these files into the ./build directory
+/androidgcs/build.xml
+/androidgcs/local.properties
+/androidgcs/proguard-project.txt
+
+# Ignore build output from Eclipse android builds
+/androidgcs/bin/
+/androidgcs/gen/
+
+# Ignore Eclipse Projects and Metadata
+/.cproject
+/.project
+/.metadata
+/.settings
+/.pydevproject
+
+# Ignore Eclipse temp folder, git plugin based?
+RemoteSystemsTempFiles
+
+# Ignore patch-related files
+*.rej
+*.orig
+*.diff~