Merge pull request '完善' (#55 ) from majian_branch into master

完善
Merge pull request 'final version' (#54 ) from majian_branch into master
11 changed files with 0 additions and 1 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/~$协同无人侦察系统-软件需求构思及描述.docx
+++ b/doc/~$协同无人侦察系统-软件需求构思及描述.docx
--- a/doc/~WRL0001.tmp
+++ b/doc/~WRL0001.tmp
--- a/doc/宣传彩页.png
+++ b/doc/宣传彩页.png
--- a/doc/汇报.pptx
+++ b/doc/汇报.pptx
--- a/doc/空地协同无人侦察系统-软件设计规格说明书.doc
+++ b/doc/空地协同无人侦察系统-软件设计规格说明书.doc
--- a/doc/空地协同无人侦察系统开发项目的团队自评报告.xlsx
+++ b/doc/空地协同无人侦察系统开发项目的团队自评报告.xlsx
--- a/doc/空地协同无人侦察软件开发项目的个人自评报告.xlsx
+++ b/doc/空地协同无人侦察软件开发项目的个人自评报告.xlsx
--- a/model/设计类/体系结构设计图.vsdx
+++ b/model/设计类/体系结构设计图.vsdx
--- a/model/设计类/精化类图.vsdx
+++ b/model/设计类/精化类图.vsdx
Author	SHA1	Message	Date
pvqf6mep3	388b25d6b0	Merge pull request '完善' (#55 ) from majian_branch into master	3 years ago
大耳刮子	27b951823f	完善	3 years ago
pvqf6mep3	e09dae75b1	Merge pull request 'final version' (#54 ) from majian_branch into master	3 years ago
大耳刮子	725a4b28fd	final	3 years ago
pvqf6mep3	4ff5503da1	Merge pull request 'final' (#53 ) from majian_branch into master	3 years ago
大耳刮子	eb572bfaf3	final	3 years ago
大耳刮子	094188df48	完善	3 years ago
pvqf6mep3	ca6c0289ea	同意	3 years ago
大耳刮子	86b1bef153	自评报告	3 years ago
大耳刮子	94fb3adabc	doc	3 years ago
pvqf6mep3	3ce5f68bdc	同意	3 years ago