comparison .hgignore @ 4179:816a4408a853

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 02 Jan 2012 21:55:47 +0100
parents 9c060d6f5f11
children ffd5ce8fc736
comparison
equal deleted inserted replaced
4178:d1b26c17910a 4179:816a4408a853
26 ^doc/.*/dot_temp_ 26 ^doc/.*/dot_temp_
27 ^doc/doxygen/.*$ 27 ^doc/doxygen/.*$
28 \.orig$ 28 \.orig$
29 output\.txt$ 29 output\.txt$
30 output\.cfg$ 30 output\.cfg$
31 \.cfg
31 java\.hprof\.txt$ 32 java\.hprof\.txt$
32 /nbproject/private/ 33 /nbproject/private/
33 ^graal/hotspot/java$ 34 ^graal/hotspot/java$
34 ^scratch/ 35 ^scratch/
35 scratch/ 36 scratch/