author Ed Morley <bmo@edmorley.co.uk>
Sun, 21 Aug 2011 19:14:08 +0100
changeset 75619 482742e6fff759fb007cb4414208862a72308b77
parent 51604 f87dcd8ad8e8b766c589f5a4d3385ae4d3eec388
child 76902 1a84481f69875da535508041e90041f06bd2deae
permissions -rw-r--r--
Merge mozilla-central and mozilla-inbound

# .hgignore - List of filenames hg should ignore

# Filenames that should be ignored wherever they appear

# User files that may appear at the root

# Empty marker file that's generated when we check out NSS

# Build directories

# Build directories for js shell

# SpiderMonkey configury
# SpiderMonkey test result logs

# Java HTML5 parser classes