Automated merge with https://gss.googlecode.com/hg/

[pithos] / .hgignore

diff --git a/.hgignore b/.hgignore
index 6d95710..a1c9a1f 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -1,5 +1,11 @@
 syntax: regexp
 ^build\.properties$
 ^www$
+^wwwadmin$
 ^bin$
 .DS_Store$
+^tomcat
+.swp$
+^dependencies
+^.idea
+gss.iml