Merge branch 'master' into develop

[neighbornote/NeighborNote.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 19093d8..01b5b21 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,9 +3,20 @@
 /logs/
 /res/
 /secure.txt
+/translations/*.qm
 
 # Eclipse compiled classes
 /bin/
 
 # Ignore compilation results - no need for these to be under source control
 *.class
+
+#meta files & Eclipse files
+/.metadata/
+/*.classpath
+
+#Local platform binaries
+/lib/*.dll
+
+#ini file
+NeighborNote.ini