Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

[matches/MCTX3420.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index baf45a8..74ede4e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,7 @@
 .Spotlight-V100
 .Trashes
 ehthumbs.db
-Thumbs.db
\ No newline at end of file
+Thumbs.db
+
+server/win32
+**/nbproject/private/
\ No newline at end of file