Merge "Yangman - info box from yang menu"

[dlux.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 5a723578e54f3c995310e30e4a1715ec2c055868..71fd842ffab627206259b96860ee6b8d18202eab 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,43 @@
 *.sw*
 *~
-assets/
+# assets/
+dlux-web/**/assets/
 build/
 bin/
 node_modules/
 target/
 vendor/
 .DS_Store
+
+# dlux app
+dlux-web/src/
+!dlux-web/src/less/
+
+# Eclipse
+.classpath
+.project
+.settings/
+
+# Intellij
+.idea/
+*.iml
+*.iws
+
+# Mac
+.DS_Store
+
+# Maven
+log/
+target/
+
+*.class
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+dlux-web/node
+dlux-web/src/LICENSE