Merge pull request #422 from babanin/master

Intellij IDEA project files in .gitignore
sarxos · Nov 21, 2015 · ce6d865 · ce6d865
2 parents 5f6cb52 + f89e6e5
commit ce6d865
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,7 @@ pom.xml~
 .project
 .classpath
 README.md~
-
+*.iml
+.idea/
+*.ipr
+*.iws
diff --git a/webcam-capture-examples/webcam-capture-onejar/pom.xml b/webcam-capture-examples/webcam-capture-onejar/pom.xml
@@ -14,7 +14,7 @@
 	    <dependency>
 	        <groupId>com.github.sarxos</groupId>
 	        <artifactId>webcam-capture</artifactId>
-	        <version>0.3.10-SNAPSHOT</version>
+	        <version>0.3.12-SNAPSHOT</version>
 	    </dependency>
 	</dependencies>