Merge branch 'develop' into meier/plocHandler

This commit is contained in:
Jakob Meier 2021-04-26 14:57:41 +02:00
commit fa58c8e2c3
4 changed files with 4 additions and 4 deletions

View File

@ -1,4 +1,4 @@
SW_NAME = "eive"
VERSION_MAJOR = 1
VERSION_MINOR = 3
VERSION_MINOR = 4
VERSION_SUBMINOR = 0

View File

@ -16,7 +16,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,

View File

@ -16,7 +16,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,

@ -1 +1 @@
Subproject commit 1e3a1bd0d787feeb36b0936f29ba7ab513dfa63d
Subproject commit 1773f62856f6c430c380f4c256d54a7a0b8f0a75