Merge branch 'master' into 73b2-layout-change · jsk-ros-pkg/jsk_demos@ff917b7

Commit

Merge branch 'master' into 73b2-layout-change

Browse files

k-okada authored Apr 3, 2021

2 parents b773d1b + 4066a7b commit ff917b7

+24 −2		.travis.yml
+145 −0		CHANGELOG.rst
+10 −1		CMakeLists.txt
+17 −0		README.md
+4 −96		docker.sh
+0 −2		docker/Dockerfile.ros-ubuntu:12.04-base
+0 −2		docker/Dockerfile.ros-ubuntu:14.04-base
+11 −3		docker/Dockerfile.ros-ubuntu:14.04-pcl
+25 −3		docker/Dockerfile.ros-ubuntu:14.04-pcl1.8
+0 −2		docker/Dockerfile.ros-ubuntu:16.04-base
+15 −1		docker/Dockerfile.ros-ubuntu:16.04-pcl
+0 −2		docker/Dockerfile.ros-ubuntu:18.04-base
+15 −1		docker/Dockerfile.ros-ubuntu:18.04-pcl
+48 −0		docker/Dockerfile.ros-ubuntu:20.04
+3 −0		docker/Dockerfile.ros-ubuntu:20.04-base
+25 −0		docker/Dockerfile.ros-ubuntu:20.04-pcl
+30 −15		docker/Makefile
+15 −6		package.xml
+8 −0		rosdep-install.sh
+22 −0		test/test_env_var.py
+19 −0		test/test_scipy.py
+61 −37		travis.sh
+97 −23		travis_jenkins.py
+95 −0		travis_utils.sh