Merge remote-tracking branch 'upstream/master' into pulled

# Conflicts:
#	build.gradle
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.jar
#	gradle/wrapper/gradle-wrapper.properties
#	gradlew
#	gradlew.bat
#	src/main/java/com/jogamp/gluegen/jcpp/MacroTokenSource.java
#	src/main/java/com/jogamp/gluegen/jcpp/Preprocessor.java
#	src/main/java/com/jogamp/gluegen/jcpp/SourceIterator.java
#	src/main/java/org/anarres/cpp/Main.java
#	src/test/java/com/jogamp/gluegen/jcpp/PragmaTest.java
#	src/test/java/com/jogamp/gluegen/jcpp/RegressionTest.java
#	src/test/java/com/jogamp/gluegen/jcpp/VaArgsPastingTest.java

1 files changed, 18 insertions, 0 deletions

diff --git a/src/test/resources/lines1.h b/src/test/resources/lines1.h
new file mode 100644
index 0000000..934a3a9
--- /dev/null
+++ b/src/test/resources/lines1.h
@@ -0,0 +1,18 @@
+
+lines1-h-line-2
+
+/* multi
+line
+comment
+*/
+
+#include <lines2.h>
+lines1-h-line-10
+
+lines1-h-line-12
+#include <lines2.h>
+
+/* trailing multiline comment
+with
+more lines
+*/