author Gregory Szorc <gps@mozilla.com>
Wed, 27 Feb 2013 21:02:02 -0800
changeset 123267 1e646e6ddbcd5c3dd2c8233945d14ef1154bd16f
parent 123232 f58efdc21e14cc784045fd6d173f746cea0fcc45
child 126734 03452b187c1406f07556cf5f0db7e99cc3a93aae
permissions -rw-r--r--
Merge mozilla-central into build-system The 3 merged files had no conflicts and were manually verified to ensure no incompatible changes crept in.

# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

PARALLEL_DIRS += ['public', 'src']
TEST_DIRS += ['test']