eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-23 00:29:19 +02:00
Code Issues 123 Wiki Activity

rename autogenerated version file, it clashes during merges

Browse Source
This commit is contained in:
milek7
2020-10-19 02:38:53 +02:00
parent 2881747eb0
commit b4951a5db4
5 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Globals.h
View File

@@ -16,7 +16,6 @@ http://mozilla.org/MPL/2.0/.
#include "light.h"
#include "utilities.h"
#include "motiontelemetry.h"
#include "version.h"
#ifdef WITH_UART
#include "uart.h"
#endif
@@ -204,7 +203,7 @@ struct global_settings {
int iMultiplayer{ 0 }; // blokada działania niektórych eventów na rzecz kominikacji
// other
std::string AppName{ "EU07" };
std::string asVersion{ VERSION_INFO }; // z opisem
std::string asVersion; // z opisem
motiontelemetry::conf_t motiontelemetry_conf;
std::string screenshot_dir;
bool loading_log = true;