Merge branch 'master' of github.com:purplefox/vert.x

pokerjocke70 · May 17, 2012 · 897e5b3 · 897e5b3
2 parents 519f92a + 3b81a8f
commit 897e5b3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,8 @@ bin
 target
 out
 *.iml
+*.ipr
+*.iws
 test-output
 Scratch.java
 ScratchTest.java

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,7 @@
 apply plugin: 'java'
 apply plugin: 'groovy'
+apply plugin: 'idea'
+apply plugin: 'eclipse'
 
 version = '1.0.beta1'
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,8 @@ bin @@
     target
     out
     *.iml
+    *.ipr
+    *.iws
     test-output
     Scratch.java
     ScratchTest.java
@@ Expand Down @@