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 2016-02-12 16:18:54 +01:00
commit 53febd82d1
10 changed files with 91 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/dtsc.h
View file

@ -329,6 +329,8 @@ namespace DTSC {
int width;
int height;
int fpks;
private:
std::string cachedIdent;
};
///\brief Class for storage of meta data