Merge branch 'master' into devel

stack-of-tasks · May 11, 2020 · 33539b8 · 33539b8
2 parents bde3889 + 0d5d490
commit 33539b8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmake b/cmake
diff --git a/package.xml b/package.xml
@@ -1,6 +1,6 @@
 <package format="2">
   <name>sot-talos</name>
-  <version>1.1.1</version>
+  <version>1.2.0</version>
   <description>
     Stack of Tasks for Talos.
   </description>
+7 −0		.docs/pages/developers.rst
+4 −0		.docs/pages/internal.rst
+80 −1		Config.cmake.in
+23 −0		base.cmake
+9 −9		boost.cmake
+474 −686		doxygen.cmake
+0 −4		doxygen/Doxyfile.extra.in
+0 −2,121		doxygen/Doxyfile.in
+10 −0		doxygen/doxyfile.awk
+5 −2		hpp/doc.cmake
+18 −3		package-config.cmake
+38 −8		pkg-config.cmake
+1 −1		pkg-config.pc.cmake
+5 −2		python.cmake