revert merge

[fanfix.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 8184903d3d1a2f0d342979ceb7953be144711037..30d9f7c701397a07ff13ad91bb0cf1c59cdf3351 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 *.class
+bin/**
+build/**
 
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
@@ -8,10 +10,26 @@
 *.war
 *.ear
 
+# Generated docs
+docs/**
+
+# Maven artifacts
+target/**
+
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
 # Editor backup files
 *.java~
 *.xml~
-*Makefile~
+
+# Scratch space
+misc/**
+/.project~
+
+pmd.bash
+pmd-results.html
+examples/*.sh
+
+# Fonts for testing
+fonts/**