mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2024-11-29 07:24:13 +01:00
754f58c33a
Conflicts: flight/Modules/ManualControl/inc/manualcontrol.h flight/Revolution/Makefile.osx ground/openpilotgcs/src/plugins/plugins.pro ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp shared/uavobjectdefinition/flightstatus.xml shared/uavobjectdefinition/hwsettings.xml shared/uavobjectdefinition/manualcontrolsettings.xml shared/uavobjectdefinition/taskinfo.xml
83 lines
1.7 KiB
Plaintext
83 lines
1.7 KiB
Plaintext
# Exclude temporary and system files
|
|
.DS_Store
|
|
|
|
# /flight/
|
|
/flight/*.pnproj
|
|
/flight/*.pnps
|
|
/flight/.cproject
|
|
/flight/.metadata
|
|
/flight/.project
|
|
/flight/.settings
|
|
/flight/Build
|
|
|
|
# /flight/AHRS/
|
|
/flight/AHRS/Build
|
|
|
|
# /flight/Bootloaders/OpenPilot.old/
|
|
/flight/Bootloaders/OpenPilot.old/Build
|
|
|
|
# /flight/OpenPilot/
|
|
/flight/OpenPilot/Build
|
|
/flight/OpenPilot/Build.win32
|
|
|
|
#flight/Project/OpenPilotOSX
|
|
flight/Project/OpenPilotOSX/build
|
|
|
|
# /flight/PipBee/
|
|
/flight/PipBee/Build
|
|
|
|
# /flight/Project/OpenPilotOSX/
|
|
/flight/Project/OpenPilotOSX/build/
|
|
|
|
# /ground/
|
|
/ground/Build
|
|
|
|
/ground/openpilotgcs/share/openpilotgcs/models/Easystar/Thumbs.db
|
|
|
|
/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/OPMapWidget/core/header.h
|
|
|
|
/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 artifacts of top-level Makefile
|
|
/downloads
|
|
/tools
|
|
/build
|
|
|
|
openpilotgcs-build-desktop
|
|
flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/*.mode1v3
|
|
flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/*.pbxuser
|
|
|
|
# Ignore some of the .pro.user files
|
|
ground/openpilotgcs/openpilotgcs.pro.user
|
|
ground/uavobjgenerator/uavobjgenerator.pro.user
|
|
ground/uavobjects/uavobjects.pro.user
|
|
ground/ground.pro.user
|
|
|
|
GPATH
|
|
GRTAGS
|
|
GSYMS
|
|
GTAGS
|
|
|
|
plane
|
|
quad
|
|
|
|
# Ignore auto generated java files
|
|
androidgcs/bin/
|
|
androidgcs/gen/
|
|
/.cproject
|
|
/.project
|