Merge mozilla-central to mozilla-inbound

This commit is contained in:
Ed Morley 2012-07-11 17:29:22 +01:00
commit 61af7a9160

View File

@ -12,6 +12,12 @@
<true/>
<key>^Resources/</key>
<true/>
<key>^MacOS/distribution/.*</key><dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>10</real>
</dict>
<key>^MacOS/updates/.*</key><dict>
<key>omit</key>
<true/>