Skip to content
Snippets Groups Projects
Commit 08256a0b authored by Julian Cerruti's avatar Julian Cerruti
Browse files

Merge branch 'kinetic' into obsolete/master

Conflicts:
	CHANGELOG.rst
	CMakeLists.txt
	cmake/rosjava.cmake.em
	env-hooks/15.rosjava.bash.em
	env-hooks/15.rosjava.sh.em
	package.xml
	src/rosjava_build_tools/create_android_project.py
	src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.jar
	src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.properties
	src/rosjava_build_tools/release.py
	src/rosjava_build_tools/templates/android_package/build.gradle.in
	src/rosjava_build_tools/templates/android_project/build.gradle.in
	src/rosjava_build_tools/templates/rosjava_msg_project/build.gradle.in
	src/rosjava_build_tools/templates/rosjava_package/CMakeLists.txt.in
	src/rosjava_build_tools/templates/rosjava_package/build.gradle.in
	src/rosjava_build_tools/templates/rosjava_project/build.gradle.in
parents acd088d4 662c6224
No related branches found
No related tags found
No related merge requests found
Showing
with 307 additions and 129 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment