diff .hgignore @ 7559:f701f2ce0f59

Merge.
author Doug Simon <doug.simon@oracle.com>
date Fri, 25 Jan 2013 16:05:41 +0100
parents 9c6602e65423
children 2fc832fbff8d
line wrap: on
line diff
--- a/.hgignore	Fri Jan 25 16:05:11 2013 +0100
+++ b/.hgignore	Fri Jan 25 16:05:41 2013 +0100
@@ -20,6 +20,7 @@
 ~$
 .gdb_history
 \.csv$
+\.iml$
 \.swp$
 \.class$
 \.log$
@@ -59,6 +60,7 @@
 ^.hgtip
 .DS_Store
 javadoc/
+.idea/
 syntax: glob
 *.bgv
 core.*