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:
#	src/controller/controller_api.cpp
#	src/controller/controller_api.h
#	src/controller/controller_statistics.cpp
#	src/controller/controller_statistics.h
This commit is contained in:
Thulinma 2018-03-20 20:15:10 +01:00
commit 355d55decc
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/controller/controller_statistics.cpp
View file

@ -72,7 +72,6 @@ void Controller::updateBandwidthConfig(){
}
}
//For server-wide totals. Local to this file only.
struct streamTotals {
unsigned long long upBytes;