Merge branch 'master' into develop

2015-01-31 01:09:05 +02:00
parent 1d72e91fc3 5d353ad2b9
commit f8a27e5e76
1 changed files with 1 additions and 1 deletions
--- a/test/assert_test.cpp
+++ b/test/assert_test.cpp
@@ -58,7 +58,7 @@ void test_disabled()
    BOOST_ASSERT(p);
    BOOST_ASSERT_MSG(p, "msg");

-    // supress warnings
+    // suppress warnings
    p = &x;
    p = &p;
 }