From 7da8b2fa733a08d0485a65d1dbec79d1acc60c39 Mon Sep 17 00:00:00 2001
From: Tristan Walter <twalter@orn.mpg.de>
Date: Mon, 12 Oct 2020 21:52:36 +0200
Subject: [PATCH] changed both versions to 1.0
---
Application/src/grabber/default_config.cpp | 2 +-
Application/src/tracker/misc/default_config.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Application/src/grabber/default_config.cpp b/Application/src/grabber/default_config.cpp
index af8ce59..0a2afc6 100644
--- a/Application/src/grabber/default_config.cpp
+++ b/Application/src/grabber/default_config.cpp
@@ -72,7 +72,7 @@ namespace default_config {
#endif
CONFIG("app_name", std::string("TGrabs"), "Name of the application.", SYSTEM);
- CONFIG("version", std::string("RC6"), "Version of the application.", SYSTEM);
+ CONFIG("version", std::string("1.0"), "Version of the application.", SYSTEM);
CONFIG("color_channel", size_t(1), "Index (0-2) of the color channel to be used during video conversion, if more than one channel is present in the video file.");
CONFIG("system_memory_limit", uint64_t(0), "Custom override of how many bytes of system RAM the program is allowed to fill. If `approximate_length_minutes` or `stop_after_minutes` are set, this might help to increase the resulting RAW video footage frame_rate.");
diff --git a/Application/src/tracker/misc/default_config.cpp b/Application/src/tracker/misc/default_config.cpp
index fb809bf..6f3159d 100644
--- a/Application/src/tracker/misc/default_config.cpp
+++ b/Application/src/tracker/misc/default_config.cpp
@@ -193,7 +193,7 @@ file::Path conda_environment_path() {
Adding adding(config, docs, fn);
CONFIG<std::string>("app_name", "TRex", "Name of the application.", SYSTEM);
- CONFIG("version", std::string("RC6"), "Current application version.", SYSTEM);
+ CONFIG("version", std::string("1.0"), "Current application version.", SYSTEM);
CONFIG("build", std::string(), "Current build version", SYSTEM);
CONFIG("cmd_line", std::string(), "An approximation of the command-line arguments passed to the program.", SYSTEM);
CONFIG("ffmpeg_path", file::Path(), "Path to an ffmpeg executable file. This is used for converting videos after recording them (from the GUI). It is not a critical component of the software, but mostly for convenience.");
--
GitLab