Merge branch 'master' of git://github.com/dCache/xrootd4j

Conflicts: .gitignore README.md
vingar · Aug 14, 2012 · 5f9b9e6 · 5f9b9e6
2 parents 839d0a3 + bd0d0cf
commit 5f9b9e6
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,9 @@
 *~
 .idea
 *.iml
+*.class
+
+# Package Files #
+*.jar
+*.war
+*.ear