Merge master into cmake-2

This commit is contained in:
Lorenz Meier
2015-10-03 15:34:30 +02:00
10 changed files with 121 additions and 25 deletions
@@ -116,4 +116,4 @@ PARAM_DEFINE_FLOAT(ATT_BIAS_MAX, 0.05f);
* @min 0.001
* @max 100
*/
PARAM_DEFINE_FLOAT(ATT_VIBE_THRESH, 0.1f);
PARAM_DEFINE_FLOAT(ATT_VIBE_THRESH, 0.2f);