# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1330100268 -3600
# Node ID dd521d4817343811aa46f53d8fe3924977b27ea8
# Parent  f5c1bd9c70b9a6a193806350a21bbfece8538d9f# Parent  72029d4b16ca9f6636e217f176b4561282f6b314
Merge

diff -r f5c1bd9c70b9 -r dd521d481734 .hgignore
--- a/.hgignore	Fri Feb 24 17:16:39 2012 +0100
+++ b/.hgignore	Fri Feb 24 17:17:48 2012 +0100
@@ -23,6 +23,8 @@
 \.pdf$
 \.dot$
 \.pyc$
+\.hprof$
+\.hprof\.txt$
 ^graal/.*/build.xml
 ^graal/.*/nbproject/
 dist
@@ -32,7 +34,6 @@
 output\.txt$
 output\.cfg$
 \.cfg
-java\.hprof\.txt$
 /nbproject/private/
 ^graal/hotspot/java$
 ^scratch/