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:
#	lib/shared_memory.cpp
#	src/controller/controller.cpp
#	src/controller/controller_storage.h
#	src/output/output.cpp
This commit is contained in:
Thulinma 2016-09-15 16:17:06 +02:00
commit 1172768c34
20 changed files with 270 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/config.cpp
View file

@ -229,7 +229,7 @@ bool Util::Config::parseArgs(int & argc, char ** & argv) {
#endif
/*LTS-END*/
std::cout << "Built on " __DATE__ ", " __TIME__ << std::endl;
exit(1);
exit(0);
break;
default:
jsonForEach(vals, it) {