author Benjamin Smedberg <>
Mon, 21 Jun 2010 11:41:42 -0400
changeset 47008 79ae7224e6273199d0db9638043e531942bc10fd
parent 39579 af2a60e9e64e5d0d895c94ba775797445539f90c
permissions -rw-r--r--
Merge mozilla-central into the "branch" for but 568691. The omnijar XPT/component/chrome registration was removed during this merge, and will be re-added to the component manager shortly.

# i386/x86-64 Universal Build mozconfig

# As used here, arguments in $MOZ_BUILD_PROJECTS are suitable as arguments
# to gcc's -arch parameter.
mk_add_options MOZ_BUILD_PROJECTS="i386 x86_64"

. $topsrcdir/build/macosx/universal/mozconfig.common