sync with 'dev'

This commit is contained in:
Alberto Griggio
2017-11-23 11:09:13 +01:00
37 changed files with 213 additions and 10 deletions

View File

@@ -755,7 +755,7 @@ public:
{
enabled = false;
threshold = 0;
amount = 0;
amount = 1;
}
};