merge
diff --git a/.hgignore b/.hgignore
index c51c53c..e30ec86 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,6 +1,7 @@
 .gdb_history
 .purify
 .svn/
+^.idea/
 .DS_Store
 Makefile$
 Makefile.pre$