Merge commit 'refs/integration/team/platform/merge-naoqi-libqi-303'

opennao · opennao · commit ec9fc0edef0b · 2021-09-28T11:36:37.000+02:00
diff --git a/cmake/set_libqi_dependency.cmake b/cmake/set_libqi_dependency.cmake
@@ -1,4 +1,4 @@
-overridable_variable(LIBQI_VERSION 1.8.7)
+overridable_variable(LIBQI_VERSION 2.0.0)
 
 # Our github clone is sometimes late or is missing tags, so we enable
 # customisation of the URL at configuration time, so users can use another clone.
diff --git a/qi/_version.py b/qi/_version.py
@@ -1 +1 @@
-__version__ = '2.0.2'
+__version__ = '3.0.0'

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-overridable_variable(LIBQI_VERSION 1.8.7)`
	`1`	`+overridable_variable(LIBQI_VERSION 2.0.0)`
`2`	`2`
`3`	`3`	`# Our github clone is sometimes late or is missing tags, so we enable`
`4`	`4`	`# customisation of the URL at configuration time, so users can use another clone.`