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, 62 insertions, 2 deletions

diff --git a/.gitignore b/.gitignore
index 9d7ac43..7507685 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,64 @@
-build
-.*.swp
+# Compiled source #
+###################
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so
+
+# Packages #
+############
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.dmg
+*.gz
+*.iso
+*.rar
+*.tar
+*.zip
+
+# Logs and databases #
+######################
+*.log
+
+# OS generated files #
+######################
+.DS_Store*
+ehthumbs.db
+Icon?
+Thumbs.db
+
+# Editor Files #
+################
+*~
+*.swp
+
+# Gradle Files #
+################
 .gradle
+
+# Build output directies
+/target
+*/target
+/build
+*/build
+
+# IntelliJ specific files/directories
+out
+.idea
+*.ipr
+*.iws
+*.iml
+atlassian-ide-plugin.xml
+
+# Eclipse specific files/directories
+.classpath
+.project
+.settings
+.metadata
+
+# NetBeans specific files/directories
+.nbattrs
 .nb-gradle