Commit 43169a18 authored by Lorenz Meier's avatar Lorenz Meier

Merge branch 'master' of github.com:mavlink/qgroundcontrol

parents 9dd0bc12 5c579445
......@@ -57,3 +57,12 @@ GeneratedFiles/
*.autosave
.settings/
# Generated files
moc_*
ui_*
*.o
*.a
*.so*
*.moc
*.prl
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment