author Benjamin Smedberg <benjamin@smedbergs.us>
Thu, 01 Jul 2010 11:55:57 -0400
changeset 47092 e90cbf73a8be1a3803ffb1c907388b3c8dfde8bf
parent 41521 8b1842164185782ad587a4d341166950d99d5380
child 51604 f87dcd8ad8e8b766c589f5a4d3385ae4d3eec388
permissions -rw-r--r--
Merge mozilla-central, including the Electrolysis changes, into the branch for bug 568691.

# .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