Merge branch 'master' into doxygen

Merge 3.0.12 release changes from master.
2017-02-01 02:21:35 +01:00 · 2017-02-01 02:21:35 +01:00 · 294ab27b90
commit 294ab27b90
parent 751f617aac 77a9907dd9
254 changed files with 4158 additions and 2457 deletions
--- a/Examples/test-suite/java/Makefile.in
+++ b/Examples/test-suite/java/Makefile.in
@ -31,6 +31,7 @@ CPP_TEST_CASES = \
 	java_director_exception_feature \
 	java_director_exception_feature_nspace \
 	java_director_ptrclass \
+	java_director_typemaps \
 	java_enums \
 	java_jnitypes \
 	java_lib_arrays_dimensionless \