Merge pull request #104 from pnorman/patch-1

[potlatch2.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index f3b6c16..4bdb2fc 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,21 @@
+.DS_Store
 build.properties
 l10n/locale/bundles
 version.as
 halcyon.tmproj
+Potlatch2.as3proj
 
 resources/locales
 resources/*.swf
 resources/*.cache
 resources/docs
+resources/mapquest
+resources/generated
 
 /tests/bin/
 /tests/report/
 
 /generated
+
+bin/
+obj/