Merge remote-tracking branch 'origin/develop' into mueller/master

updated version tag for first release
updated core develop
2021-02-13 19:00:08 +01:00 · 2021-02-09 12:53:44 +01:00 · 2021-02-09 12:46:30 +01:00 · 2020-12-30 23:38:20 +01:00 · 2020-12-29 12:31:47 +01:00 · 2020-12-17 19:37:34 +01:00
2 changed files with 4 additions and 6 deletions
--- a/config/tmtcc_version.py
+++ b/config/tmtcc_version.py
@@ -3,8 +3,6 @@
@details    Template configuration file. Copy this folder to the TMTC commander root and adapt
            it to your needs.
 """
-import tmtc_core.core.tmtcc_version as core
-
-SW_NAME = core.SW_NAME
-SW_VERSION = core.SW_VERSION
-SW_SUBVERSION = core.SW_SUBVERSION
+SW_NAME = "eive"
+SW_VERSION = 1
+SW_SUBVERSION = 1
--- a/2
+++ b/2
Author	SHA1	Message	Date
Robin Mueller	c10fbe7fbe	Merge remote-tracking branch 'origin/develop' into mueller/master	2021-02-13 19:00:08 +01:00
Robin Mueller	a0280c880b	updated version tag for first release	2021-02-09 12:53:44 +01:00
Robin Mueller	d9fc5563ce	updated core develop	2021-02-09 12:46:30 +01:00
Robin.Mueller	4b0d457937	tmtc core update	2020-12-30 23:38:20 +01:00
Robin Mueller	b1dc449ccf	Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive_tmtc into mueller/master	2020-12-29 12:31:47 +01:00
Robin Mueller	07b6a9df18	core update	2020-12-17 19:37:34 +01:00