Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-09-14 13:54:04 +02:00
61 changed files with 50439 additions and 713 deletions

View File

@@ -52,8 +52,6 @@
class CFile
{
private:
mutable int Type;
public:
enum FileType
{