Merge latest master into doxygen branch.

2014-12-15 02:54:57 +01:00 · 2014-12-15 02:54:57 +01:00 · 9b857e6cf1
commit 9b857e6cf1
parent 05b5ed11bc ae555c2339
275 changed files with 6821 additions and 2094 deletions
--- a/Examples/test-suite/java/Makefile.in
+++ b/Examples/test-suite/java/Makefile.in
@ -40,6 +40,9 @@ CPP_TEST_CASES = \
 	java_typemaps_typewrapper
 #	li_boost_intrusive_ptr

+CPP11_TEST_CASES = \
+	cpp11_strongly_typed_enumerations_simple \
+
 DOXYGEN_TEST_CASES := \
 	doxygen_parsing_enums_simple \
 	doxygen_parsing_enums_proper \