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/input/input_buffer.cpp
This commit is contained in:
Thulinma 2015-11-27 10:44:09 +01:00
commit 9e1f0fcb7d
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/input/input_buffer.cpp
View file

@ -138,7 +138,7 @@ namespace Mist {
if (it->second.firstms < firstms){
firstms = it->second.firstms;
}
if (it->second.firstms > lastms){
if (it->second.lastms > lastms){
lastms = it->second.lastms;
}
}