WolverinDEV 4b48f2741c Merge branch '1.4.10' ... # Conflicts: # CMakeLists.txt # src/Properties.h		2020-04-18 11:23:01 +02:00
..
converter.cpp	Updated the property system and added a packet loss calculator	2020-04-08 02:56:08 +02:00
converter.h	Merge branch '1.4.10'	2020-04-18 11:23:01 +02:00