Merge pull request 'final version' (#54 ) from majian_branch into master

final
7 changed files with 0 additions and 7 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -13,7 +13,6 @@ find_package(catkin REQUIRED COMPONENTS
  image_transport
 )
 ## DEPENDS: system dependencies of this project that dependent projects also need
 catkin_package(
--- a/doc/~$协同无人侦察系统-软件设计规格说明书.doc
+++ b/doc/~$协同无人侦察系统-软件设计规格说明书.doc
--- a/doc/~WRL0001.tmp
+++ b/doc/~WRL0001.tmp
--- a/model/设计类/~$$精化类图.~vsdx
+++ b/model/设计类/~$$精化类图.~vsdx
--- a/model/设计类/精化类图.vsdx
+++ b/model/设计类/精化类图.vsdx
--- a/src/.scannerwork/.sonar_lock
+++ b/src/.scannerwork/.sonar_lock
--- a/src/.scannerwork/report-task.txt
+++ b/src/.scannerwork/report-task.txt
@ -1,6 +0,0 @@
 projectKey=CEC
 serverUrl=http://localhost:9000
 serverVersion=9.4.0.54424
 dashboardUrl=http://localhost:9000/dashboard?id=CEC
 ceTaskId=AYHgkSABciXJR8mKLIhs
 ceTaskUrl=http://localhost:9000/api/ce/task?id=AYHgkSABciXJR8mKLIhs
Author	SHA1	Message	Date
pvqf6mep3	e09dae75b1	Merge pull request 'final version' (#54 ) from majian_branch into master	2 years ago
大耳刮子	725a4b28fd	final	2 years ago