Merge remote-tracking branch 'remotes/origin/master' into develop

2018-04-16 17:47:27 +09:00 · 2018-04-16 17:47:27 +09:00 · 9bf506aa0c
commit 9bf506aa0c
parent 66f3b91ce9 014a28cd8f
44 changed files with 0 additions and 0 deletions
--- a/ball_detector/msg/CircleSetStamped.msg
+++ b/ball_detector/msg/CircleSetStamped.msg
--- a/op3_demo/data/mp3/Autonomous
+++ b/op3_demo/data/mp3/Autonomous
--- a/op3_demo/data/mp3/Bye
+++ b/op3_demo/data/mp3/Bye
--- a/op3_demo/data/mp3/Clap
+++ b/op3_demo/data/mp3/Clap
--- a/op3_demo/data/mp3/Demonstration
+++ b/op3_demo/data/mp3/Demonstration
--- a/op3_demo/data/mp3/Headstand.mp3
+++ b/op3_demo/data/mp3/Headstand.mp3
--- a/op3_demo/data/mp3/Interactive
+++ b/op3_demo/data/mp3/Interactive
--- a/op3_demo/data/mp3/Intro01.mp3
+++ b/op3_demo/data/mp3/Intro01.mp3
--- a/op3_demo/data/mp3/Intro02.mp3
+++ b/op3_demo/data/mp3/Intro02.mp3
--- a/op3_demo/data/mp3/Intro03.mp3
+++ b/op3_demo/data/mp3/Intro03.mp3
--- a/op3_demo/data/mp3/Introduction.mp3
+++ b/op3_demo/data/mp3/Introduction.mp3
--- a/op3_demo/data/mp3/Left
+++ b/op3_demo/data/mp3/Left
--- a/op3_demo/data/mp3/No.mp3
+++ b/op3_demo/data/mp3/No.mp3
--- a/op3_demo/data/mp3/Oops.mp3
+++ b/op3_demo/data/mp3/Oops.mp3
--- a/op3_demo/data/mp3/Right
+++ b/op3_demo/data/mp3/Right
--- a/op3_demo/data/mp3/Sensor
+++ b/op3_demo/data/mp3/Sensor
--- a/op3_demo/data/mp3/Sensor
+++ b/op3_demo/data/mp3/Sensor
--- a/op3_demo/data/mp3/Shoot.mp3
+++ b/op3_demo/data/mp3/Shoot.mp3
--- a/op3_demo/data/mp3/Sit
+++ b/op3_demo/data/mp3/Sit
--- a/op3_demo/data/mp3/Stand
+++ b/op3_demo/data/mp3/Stand
--- a/op3_demo/data/mp3/Start
+++ b/op3_demo/data/mp3/Start
--- a/op3_demo/data/mp3/Start
+++ b/op3_demo/data/mp3/Start
--- a/op3_demo/data/mp3/Start
+++ b/op3_demo/data/mp3/Start
--- a/op3_demo/data/mp3/System
+++ b/op3_demo/data/mp3/System
--- a/op3_demo/data/mp3/Thank
+++ b/op3_demo/data/mp3/Thank
--- a/op3_demo/data/mp3/Vision
+++ b/op3_demo/data/mp3/Vision
--- a/op3_demo/data/mp3/Wow.mp3
+++ b/op3_demo/data/mp3/Wow.mp3
--- a/op3_demo/data/mp3/Yes
+++ b/op3_demo/data/mp3/Yes
--- a/op3_demo/data/mp3/Yes.mp3
+++ b/op3_demo/data/mp3/Yes.mp3
--- a/op3_demo/data/mp3/intro_test.mp3
+++ b/op3_demo/data/mp3/intro_test.mp3
--- a/op3_demo/data/mp3/test/Announce
+++ b/op3_demo/data/mp3/test/Announce
--- a/op3_demo/data/mp3/test/Button
+++ b/op3_demo/data/mp3/test/Button
--- a/op3_demo/data/mp3/test/Mic
+++ b/op3_demo/data/mp3/test/Mic
--- a/op3_demo/data/mp3/test/Mode
+++ b/op3_demo/data/mp3/test/Mode
--- a/op3_demo/data/mp3/test/Mode
+++ b/op3_demo/data/mp3/test/Mode
--- a/op3_demo/data/mp3/test/Self
+++ b/op3_demo/data/mp3/test/Self
--- a/op3_demo/data/mp3/test/Start
+++ b/op3_demo/data/mp3/test/Start
--- a/op3_demo/data/mp3/test/Start
+++ b/op3_demo/data/mp3/test/Start
--- a/op3_demo/data/mp3/test/Start
+++ b/op3_demo/data/mp3/test/Start
--- a/op3_demo/data/mp3/test/Start
+++ b/op3_demo/data/mp3/test/Start
--- a/op3_demo/data/mp3/test/Start
+++ b/op3_demo/data/mp3/test/Start
--- a/op3_demo/data/mp3/test/Start
+++ b/op3_demo/data/mp3/test/Start
--- a/op3_demo/data/mp3/test/User
+++ b/op3_demo/data/mp3/test/User
--- a/op3_demo/data/mp3/test/User
+++ b/op3_demo/data/mp3/test/User