Merge branch 'master' into develop

2017-08-25 19:47:02 +01:00
parent a7dd324d41 9e51aa81ca
commit f6c3a163f0
1 changed files with 0 additions and 1 deletions
--- a/test/config_info.cpp
+++ b/test/config_info.cpp
@ -1142,7 +1142,6 @@ void print_boost_macros()
   PRINT_MACRO(BOOST_NO_VOID_RETURNS);


-
   // END GENERATED BLOCK

   PRINT_MACRO(BOOST_INTEL);