Merge branch 'master' into javalist

2017-06-05 21:55:12 +01:00 · 2017-06-05 21:55:12 +01:00 · 4db1300622
commit 4db1300622
parent 3908817fc3 9d5d991f83
798 changed files with 26703 additions and 7774 deletions
--- a/Examples/test-suite/java/Makefile.in
+++ b/Examples/test-suite/java/Makefile.in
@ -28,6 +28,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 \