Merge branch 'master' into 6.x

2018-06-04 17:44:10 +02:00
parent fc2e3a4ab3 011aac43d2
commit 0139354780
12 changed files with 104 additions and 14 deletions
--- a/test/Misc/CMakeLists.txt
+++ b/test/Misc/CMakeLists.txt
@ -8,6 +8,7 @@ add_executable(MiscTests
 	StringTraits.cpp
 	TypeTraits.cpp
 	unsigned_char.cpp
+	version.cpp
 	vla.cpp
 )