Merge branch 'master' into maven3compat

mojo-executor · Feb 3, 2011 · 2aa3923 · 2aa3923
2 parents 84c72a4 + a753756
commit 2aa3923
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,8 @@
 *.ipr
 *.iml
 *.iws
+.idea
 target
 .classpath
 .project
-.settings
+.settings