Merge branch 'master' of github.com:Rayman2200/PDFA3

Conflicts: .gitignore
JueRei · Apr 7, 2014 · 90c2efd · 90c2efd
2 parents 6e07f2e + 99827f0
commit 90c2efd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,9 @@
-/target
-/.project
-/.classpath
-/.settings
-/PDFA*.pdf
+.project
+.classpath
+.settings/
+PDFA*.pdf
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.next
+release.properties
diff --git a/README.md b/README.md
@@ -0,0 +1,2 @@
+PDFA3
+=====