comparison .hgignore @ 7559:f701f2ce0f59

Merge.
author Doug Simon <doug.simon@oracle.com>
date Fri, 25 Jan 2013 16:05:41 +0100
parents 9c6602e65423
children 2fc832fbff8d
comparison
equal deleted inserted replaced
7558:223f645acb9b 7559:f701f2ce0f59
18 \.settings/ 18 \.settings/
19 \.metadata/ 19 \.metadata/
20 ~$ 20 ~$
21 .gdb_history 21 .gdb_history
22 \.csv$ 22 \.csv$
23 \.iml$
23 \.swp$ 24 \.swp$
24 \.class$ 25 \.class$
25 \.log$ 26 \.log$
26 \.bak$ 27 \.bak$
27 \.aux$ 28 \.aux$
57 ^visualizer/nbplatform/ 58 ^visualizer/nbplatform/
58 ^src/share/tools/IdealGraphVisualizer/nbplatform/ 59 ^src/share/tools/IdealGraphVisualizer/nbplatform/
59 ^.hgtip 60 ^.hgtip
60 .DS_Store 61 .DS_Store
61 javadoc/ 62 javadoc/
63 .idea/
62 syntax: glob 64 syntax: glob
63 *.bgv 65 *.bgv
64 core.* 66 core.*
65 *.jar 67 *.jar
66 eclipse-build.xml 68 eclipse-build.xml