hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	CMakeLists.txt
#	lib/config.cpp
This commit is contained in:
Thulinma 2016-09-02 14:50:02 +02:00
commit b430ef239e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/config.cpp
View file

@ -206,10 +206,10 @@ bool Util::Config::parseArgs(int & argc, char ** & argv) {
#ifdef WITH_THREADNAMES #ifdef WITH_THREADNAMES
std::cout << "- Flag: With threadnames. Debuggers will show sensible human-readable thread names." << std::endl; std::cout << "- Flag: With threadnames. Debuggers will show sensible human-readable thread names." << std::endl;
#endif #endif
/*LTS-START*/
#ifdef BIGMETA #ifdef BIGMETA
std::cout << "- Flag: Big metadata. Enabled longer live stream durations. Breaks compatibility with DTSH files generated by versions without this flag." << std::endl; std::cout << "- Flag: Big metadata. Enabled longer live stream durations. Breaks compatibility with DTSH files generated by versions without this flag." << std::endl;
#endif #endif
/*LTS-START*/
#ifndef UPDATER #ifndef UPDATER
std::cout << "- Flag: Updater disabled. Server will not call back home and attempt to search for updates at regular intervals." << std::endl; std::cout << "- Flag: Updater disabled. Server will not call back home and attempt to search for updates at regular intervals." << std::endl;
#endif #endif