Skip to content

Q
qgroundcontrol
Commit b7f2fe76 authored by dogmaphobic's avatar dogmaphobic
Browse files
Options

Fixing merge conflict.

parent 8ba44b79
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
qgroundcontrol.pro
View file @ b7f2fe76
...@@ -509,6 +509,7 @@ SOURCES += \ ...@@ -509,6 +509,7 @@ SOURCES += \
src/qgcunittest/TCPLinkTest.cc \ src/qgcunittest/TCPLinkTest.cc \
src/qgcunittest/TCPLoopBackServer.cc \ src/qgcunittest/TCPLoopBackServer.cc \
src/qgcunittest/UnitTest.cc \ src/qgcunittest/UnitTest.cc \
src/qgcunittest/UnitTestList.cc \
src/VehicleSetup/SetupViewTest.cc \ src/VehicleSetup/SetupViewTest.cc \
} # DebugBuild|WindowsDebugAndRelease } # DebugBuild|WindowsDebugAndRelease
} # MobileBuild } # MobileBuild
......
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