Merge "Output reg support for nicira experimenter fields"

[openflowplugin.git] / .gitignore

diff --git a/.gitignore b/.gitignore
old mode 100755 (executable)
new mode 100644 (file)
index 70a448c..af2cea9
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,33 @@
-.idea/\r
-target/\r
-*.class\r
-*.iml\r
-**/target\r
-**/bin\r
-dist\r
-**/logs\r
-products\r
-repository\r
-workspace\r
-*~\r
-target\r
-.classpath\r
-.project\r
-.settings\r
-MANIFEST.MF\r
-xtend-gen\r
-\r
-\r
+.idea/
+target/
+target-ide/
+*.class
+*.iml
+**/target
+**/bin
+dist
+**/logs
+products
+repository
+workspace
+*~
+.classpath
+.project
+.settings
+MANIFEST.MF
+xtend-gen
+yang-gen-sal
+yang-gen-config
+.externalToolBuilders
+maven-eclipse.xml
+.metadata/
+.checkstyle
+maven-metadata-local.xml
+*.pyc
+/.pydevproject
+*.log
+.tox/
+nbactions.xml
+nb-configuration.xml
+.fbExcludeFilterFile
+.factorypath