Merge branch 'development' into LTS_development

This commit is contained in:
Thulinma 2018-08-27 14:17:20 +02:00
commit 6ddc4adadf
10 changed files with 65 additions and 37 deletions

View file

@ -25,6 +25,7 @@
namespace Mist{
JSON::Value Output::capa = JSON::Value();
Util::Config * Output::config = NULL;
int getDTSCLen(char * mapped, long long int offset){
return Bit::btohl(mapped + offset + 4);