Commit Graph

343522 Commits

Author SHA1 Message Date
Jeff Muizelaar
e020a18a88 Bug 962721. Handle the flip for CopyTexImage2D. r=bjacob
This fixes a regression from b75d69931d4a. This call to CopyTexImage2D was
forgotten during the move to handling the flip in the compositor.
2014-01-31 10:59:14 -05:00
Florian Quèze
e01ffd58d0 Bug 943618 - complete audio silence with some USB headsets, r=padenot. 2014-01-31 16:16:09 +01:00
Frédéric Wang
e272dd0b19 Part 5 - Remove MOZ_OTS_REPORT_ERRORS, whitelist Graphite/SVG tables and use SetMessageCallback. b=941019, r=jfkthame. 2014-01-31 15:09:20 +00:00
Frédéric Wang
2226ba2092 Part 4 - Update README.mozilla, moz.build files and local patches. b=941019, r=jfkthame. 2014-01-31 15:09:09 +00:00
Frédéric Wang
cbf6ad98ff Part 3 - Add #ifdef's to disable WOFF2 support. b=941019, r=jfkthame. 2014-01-31 15:08:52 +00:00
Frédéric Wang
d1ffb45211 Part 2 - Apply patch to make Process function externally visible for Windows DLL. b=941019, r=jfkthame. 2014-01-31 15:08:40 +00:00
Frédéric Wang
13582f9c09 Part 1 - Switch upstream source to khaledhosny/ots. b=941019, r=jfkthame. 2014-01-31 15:08:23 +00:00
Carsten "Tomcat" Book
99fe138546 Merge mozilla-central to mozilla-inbound on a CLOSED TREE 2014-01-31 15:11:12 +01:00
Carsten "Tomcat" Book
4652f1b266 Backed out changeset a829f51aae56 (bug 880419) to fix bustage on b2g-device Builds on a CLOSED TREE 2014-01-31 15:02:48 +01:00
Carsten "Tomcat" Book
7923627f8a Backed out changeset 01334319137e (bug 880419) to fix bustage on b2g-device Builds on a CLOSED TREE 2014-01-31 15:02:38 +01:00
Carsten "Tomcat" Book
b6b569cf47 Backed out changeset 77999d41ee0c (bug 959773) to fix bustage on b2g-device Builds on a CLOSED TREE 2014-01-31 15:02:26 +01:00
Carsten "Tomcat" Book
24b2ed8ec1 Backed out changeset be17fb052374 (bug 813645) to fix bustage on b2g-device Builds on a CLOSED TREE
--HG--
rename : media/libyuv/AUTHORS => media/webrtc/trunk/third_party/libyuv/AUTHORS
rename : media/libyuv/Android.mk => media/webrtc/trunk/third_party/libyuv/Android.mk
rename : media/libyuv/DEPS => media/webrtc/trunk/third_party/libyuv/DEPS
rename : media/libyuv/LICENSE => media/webrtc/trunk/third_party/libyuv/LICENSE
rename : media/libyuv/LICENSE_THIRD_PARTY => media/webrtc/trunk/third_party/libyuv/LICENSE_THIRD_PARTY
rename : media/libyuv/OWNERS => media/webrtc/trunk/third_party/libyuv/OWNERS
rename : media/libyuv/PATENTS => media/webrtc/trunk/third_party/libyuv/PATENTS
rename : media/libyuv/README.chromium => media/webrtc/trunk/third_party/libyuv/README.chromium
rename : media/libyuv/all.gyp => media/webrtc/trunk/third_party/libyuv/all.gyp
rename : media/libyuv/codereview.settings => media/webrtc/trunk/third_party/libyuv/codereview.settings
rename : media/libyuv/include/libyuv.h => media/webrtc/trunk/third_party/libyuv/include/libyuv.h
rename : media/libyuv/include/libyuv/basic_types.h => media/webrtc/trunk/third_party/libyuv/include/libyuv/basic_types.h
rename : media/libyuv/include/libyuv/compare.h => media/webrtc/trunk/third_party/libyuv/include/libyuv/compare.h
rename : media/libyuv/include/libyuv/convert.h => media/webrtc/trunk/third_party/libyuv/include/libyuv/convert.h
rename : media/libyuv/include/libyuv/convert_argb.h => media/webrtc/trunk/third_party/libyuv/include/libyuv/convert_argb.h
rename : media/libyuv/include/libyuv/convert_from.h => media/webrtc/trunk/third_party/libyuv/include/libyuv/convert_from.h
rename : media/libyuv/include/libyuv/convert_from_argb.h => media/webrtc/trunk/third_party/libyuv/include/libyuv/convert_from_argb.h
rename : media/libyuv/include/libyuv/cpu_id.h => media/webrtc/trunk/third_party/libyuv/include/libyuv/cpu_id.h
rename : media/libyuv/include/libyuv/format_conversion.h => media/webrtc/trunk/third_party/libyuv/include/libyuv/format_conversion.h
rename : media/libyuv/include/libyuv/mjpeg_decoder.h => media/webrtc/trunk/third_party/libyuv/include/libyuv/mjpeg_decoder.h
rename : media/libyuv/include/libyuv/planar_functions.h => media/webrtc/trunk/third_party/libyuv/include/libyuv/planar_functions.h
rename : media/libyuv/include/libyuv/rotate.h => media/webrtc/trunk/third_party/libyuv/include/libyuv/rotate.h
rename : media/libyuv/include/libyuv/rotate_argb.h => media/webrtc/trunk/third_party/libyuv/include/libyuv/rotate_argb.h
rename : media/libyuv/include/libyuv/row.h => media/webrtc/trunk/third_party/libyuv/include/libyuv/row.h
rename : media/libyuv/include/libyuv/scale.h => media/webrtc/trunk/third_party/libyuv/include/libyuv/scale.h
rename : media/libyuv/include/libyuv/scale_argb.h => media/webrtc/trunk/third_party/libyuv/include/libyuv/scale_argb.h
rename : media/libyuv/include/libyuv/scale_row.h => media/webrtc/trunk/third_party/libyuv/include/libyuv/scale_row.h
rename : media/libyuv/include/libyuv/version.h => media/webrtc/trunk/third_party/libyuv/include/libyuv/version.h
rename : media/libyuv/include/libyuv/video_common.h => media/webrtc/trunk/third_party/libyuv/include/libyuv/video_common.h
rename : media/libyuv/libyuv.gyp => media/webrtc/trunk/third_party/libyuv/libyuv.gyp
rename : media/libyuv/libyuv.gypi => media/webrtc/trunk/third_party/libyuv/libyuv.gypi
rename : media/libyuv/libyuv_nacl.gyp => media/webrtc/trunk/third_party/libyuv/libyuv_nacl.gyp
rename : media/libyuv/libyuv_test.gyp => media/webrtc/trunk/third_party/libyuv/libyuv_test.gyp
rename : media/libyuv/linux.mk => media/webrtc/trunk/third_party/libyuv/linux.mk
rename : media/libyuv/public.mk => media/webrtc/trunk/third_party/libyuv/public.mk
rename : media/libyuv/source/compare.cc => media/webrtc/trunk/third_party/libyuv/source/compare.cc
rename : media/libyuv/source/compare_common.cc => media/webrtc/trunk/third_party/libyuv/source/compare_common.cc
rename : media/libyuv/source/compare_neon.cc => media/webrtc/trunk/third_party/libyuv/source/compare_neon.cc
rename : media/libyuv/source/compare_posix.cc => media/webrtc/trunk/third_party/libyuv/source/compare_posix.cc
rename : media/libyuv/source/compare_win.cc => media/webrtc/trunk/third_party/libyuv/source/compare_win.cc
rename : media/libyuv/source/convert.cc => media/webrtc/trunk/third_party/libyuv/source/convert.cc
rename : media/libyuv/source/convert_argb.cc => media/webrtc/trunk/third_party/libyuv/source/convert_argb.cc
rename : media/libyuv/source/convert_from.cc => media/webrtc/trunk/third_party/libyuv/source/convert_from.cc
rename : media/libyuv/source/convert_from_argb.cc => media/webrtc/trunk/third_party/libyuv/source/convert_from_argb.cc
rename : media/libyuv/source/convert_jpeg.cc => media/webrtc/trunk/third_party/libyuv/source/convert_jpeg.cc
rename : media/libyuv/source/convert_to_argb.cc => media/webrtc/trunk/third_party/libyuv/source/convert_to_argb.cc
rename : media/libyuv/source/convert_to_i420.cc => media/webrtc/trunk/third_party/libyuv/source/convert_to_i420.cc
rename : media/libyuv/source/cpu_id.cc => media/webrtc/trunk/third_party/libyuv/source/cpu_id.cc
rename : media/libyuv/source/format_conversion.cc => media/webrtc/trunk/third_party/libyuv/source/format_conversion.cc
rename : media/libyuv/source/mjpeg_decoder.cc => media/webrtc/trunk/third_party/libyuv/source/mjpeg_decoder.cc
rename : media/libyuv/source/mjpeg_validate.cc => media/webrtc/trunk/third_party/libyuv/source/mjpeg_validate.cc
rename : media/libyuv/source/planar_functions.cc => media/webrtc/trunk/third_party/libyuv/source/planar_functions.cc
rename : media/libyuv/source/rotate.cc => media/webrtc/trunk/third_party/libyuv/source/rotate.cc
rename : media/libyuv/source/rotate_argb.cc => media/webrtc/trunk/third_party/libyuv/source/rotate_argb.cc
rename : media/libyuv/source/rotate_mips.cc => media/webrtc/trunk/third_party/libyuv/source/rotate_mips.cc
rename : media/libyuv/source/rotate_neon.cc => media/webrtc/trunk/third_party/libyuv/source/rotate_neon.cc
rename : media/libyuv/source/row_any.cc => media/webrtc/trunk/third_party/libyuv/source/row_any.cc
rename : media/libyuv/source/row_common.cc => media/webrtc/trunk/third_party/libyuv/source/row_common.cc
rename : media/libyuv/source/row_mips.cc => media/webrtc/trunk/third_party/libyuv/source/row_mips.cc
rename : media/libyuv/source/row_neon.cc => media/webrtc/trunk/third_party/libyuv/source/row_neon.cc
rename : media/libyuv/source/row_posix.cc => media/webrtc/trunk/third_party/libyuv/source/row_posix.cc
rename : media/libyuv/source/row_win.cc => media/webrtc/trunk/third_party/libyuv/source/row_win.cc
rename : media/libyuv/source/row_x86.asm => media/webrtc/trunk/third_party/libyuv/source/row_x86.asm
rename : media/libyuv/source/scale.cc => media/webrtc/trunk/third_party/libyuv/source/scale.cc
rename : media/libyuv/source/scale_argb.cc => media/webrtc/trunk/third_party/libyuv/source/scale_argb.cc
rename : media/libyuv/source/scale_common.cc => media/webrtc/trunk/third_party/libyuv/source/scale_common.cc
rename : media/libyuv/source/scale_mips.cc => media/webrtc/trunk/third_party/libyuv/source/scale_mips.cc
rename : media/libyuv/source/scale_neon.cc => media/webrtc/trunk/third_party/libyuv/source/scale_neon.cc
rename : media/libyuv/source/scale_posix.cc => media/webrtc/trunk/third_party/libyuv/source/scale_posix.cc
rename : media/libyuv/source/scale_win.cc => media/webrtc/trunk/third_party/libyuv/source/scale_win.cc
rename : media/libyuv/source/video_common.cc => media/webrtc/trunk/third_party/libyuv/source/video_common.cc
rename : media/libyuv/source/x86inc.asm => media/webrtc/trunk/third_party/libyuv/source/x86inc.asm
rename : media/libyuv/tools/valgrind-libyuv/libyuv_tests.bat => media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/libyuv_tests.bat
rename : media/libyuv/tools/valgrind-libyuv/libyuv_tests.py => media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/libyuv_tests.py
rename : media/libyuv/tools/valgrind-libyuv/libyuv_tests.sh => media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/libyuv_tests.sh
rename : media/libyuv/tools/valgrind-libyuv/memcheck/OWNERS => media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/memcheck/OWNERS
rename : media/libyuv/tools/valgrind-libyuv/memcheck/PRESUBMIT.py => media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/memcheck/PRESUBMIT.py
rename : media/libyuv/tools/valgrind-libyuv/memcheck/suppressions.txt => media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/memcheck/suppressions.txt
rename : media/libyuv/tools/valgrind-libyuv/memcheck/suppressions_mac.txt => media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/memcheck/suppressions_mac.txt
rename : media/libyuv/tools/valgrind-libyuv/memcheck/suppressions_win32.txt => media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/memcheck/suppressions_win32.txt
rename : media/libyuv/tools/valgrind-libyuv/tsan/OWNERS => media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/tsan/OWNERS
rename : media/libyuv/tools/valgrind-libyuv/tsan/PRESUBMIT.py => media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/tsan/PRESUBMIT.py
rename : media/libyuv/tools/valgrind-libyuv/tsan/suppressions.txt => media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/tsan/suppressions.txt
rename : media/libyuv/tools/valgrind-libyuv/tsan/suppressions_mac.txt => media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/tsan/suppressions_mac.txt
rename : media/libyuv/tools/valgrind-libyuv/tsan/suppressions_win32.txt => media/webrtc/trunk/third_party/libyuv/tools/valgrind-libyuv/tsan/suppressions_win32.txt
rename : media/libyuv/unit_test/basictypes_test.cc => media/webrtc/trunk/third_party/libyuv/unit_test/basictypes_test.cc
rename : media/libyuv/unit_test/compare_test.cc => media/webrtc/trunk/third_party/libyuv/unit_test/compare_test.cc
rename : media/libyuv/unit_test/convert_test.cc => media/webrtc/trunk/third_party/libyuv/unit_test/convert_test.cc
rename : media/libyuv/unit_test/cpu_test.cc => media/webrtc/trunk/third_party/libyuv/unit_test/cpu_test.cc
rename : media/libyuv/unit_test/math_test.cc => media/webrtc/trunk/third_party/libyuv/unit_test/math_test.cc
rename : media/libyuv/unit_test/planar_test.cc => media/webrtc/trunk/third_party/libyuv/unit_test/planar_test.cc
rename : media/libyuv/unit_test/rotate_argb_test.cc => media/webrtc/trunk/third_party/libyuv/unit_test/rotate_argb_test.cc
rename : media/libyuv/unit_test/rotate_test.cc => media/webrtc/trunk/third_party/libyuv/unit_test/rotate_test.cc
rename : media/libyuv/unit_test/scale_argb_test.cc => media/webrtc/trunk/third_party/libyuv/unit_test/scale_argb_test.cc
rename : media/libyuv/unit_test/scale_test.cc => media/webrtc/trunk/third_party/libyuv/unit_test/scale_test.cc
rename : media/libyuv/unit_test/testdata/arm_v7.txt => media/webrtc/trunk/third_party/libyuv/unit_test/testdata/arm_v7.txt
rename : media/libyuv/unit_test/testdata/tegra3.txt => media/webrtc/trunk/third_party/libyuv/unit_test/testdata/tegra3.txt
rename : media/libyuv/unit_test/unit_test.cc => media/webrtc/trunk/third_party/libyuv/unit_test/unit_test.cc
rename : media/libyuv/unit_test/unit_test.h => media/webrtc/trunk/third_party/libyuv/unit_test/unit_test.h
rename : media/libyuv/unit_test/version_test.cc => media/webrtc/trunk/third_party/libyuv/unit_test/version_test.cc
rename : media/libyuv/unit_test/video_common_test.cc => media/webrtc/trunk/third_party/libyuv/unit_test/video_common_test.cc
rename : media/libyuv/util/Makefile => media/webrtc/trunk/third_party/libyuv/util/Makefile
rename : media/libyuv/util/compare.cc => media/webrtc/trunk/third_party/libyuv/util/compare.cc
rename : media/libyuv/util/convert.cc => media/webrtc/trunk/third_party/libyuv/util/convert.cc
rename : media/libyuv/util/cpuid.c => media/webrtc/trunk/third_party/libyuv/util/cpuid.c
rename : media/libyuv/util/psnr.cc => media/webrtc/trunk/third_party/libyuv/util/psnr.cc
rename : media/libyuv/util/psnr.h => media/webrtc/trunk/third_party/libyuv/util/psnr.h
rename : media/libyuv/util/psnr_main.cc => media/webrtc/trunk/third_party/libyuv/util/psnr_main.cc
rename : media/libyuv/util/ssim.cc => media/webrtc/trunk/third_party/libyuv/util/ssim.cc
rename : media/libyuv/util/ssim.h => media/webrtc/trunk/third_party/libyuv/util/ssim.h
rename : media/libyuv/winarm.mk => media/webrtc/trunk/third_party/libyuv/winarm.mk
2014-01-31 15:02:06 +01:00
Carsten "Tomcat" Book
b9b5b8292d Backed out changeset 57d558b5d3df (bug 880419) to fix bustage on b2g-device Builds on a CLOSED TREE 2014-01-31 15:01:17 +01:00
Joel Maher
8611e7bd30 Bug 956388 - Introduce a performance test (like TART) to measure animation performance of entering/exiting customization mode. r=avih 2014-01-31 08:41:24 -05:00
Nicolas Silva
78ddfafb28 Bug 965844 - Remove the pref "layers.prefer-memory-over-shmem". r=gal 2014-01-31 14:22:25 +01:00
Nicolas Silva
7e4d9d4164 Bug 965804 - Ignore the deprecated texture pref except on Windows. r=Bas,Vlad 2014-01-31 14:17:11 +01:00
Mats Palmgren
1954d196cd Bug 963441 - Make sure we push an existing next-in-flow sibling too. r=dholbert 2014-01-31 12:36:00 +00:00
Carsten "Tomcat" Book
bd8f07df4d Merge mozilla-central to mozilla-inbound 2014-01-31 13:03:35 +01:00
Carsten "Tomcat" Book
eb003fc9d5 merge b2g-inbound to mozilla-central 2014-01-31 12:57:22 +01:00
Carsten "Tomcat" Book
f1a2c94d74 merge fx-team to mozilla-central 2014-01-31 12:52:17 +01:00
Carsten "Tomcat" Book
c2edd2f424 merge mozilla-inbound to mozilla-central 2014-01-31 12:47:14 +01:00
Masayuki Nakano
b8a91c449d Bug 964626 Fix some nits of logging code in nsTextStore r=jimm 2014-01-31 20:23:36 +09:00
Carsten "Tomcat" Book
f4bc96a601 Backed out changeset e2c75ec7f3d4 (bug 959787) for breaking b2g builds on a CLOSED TREE 2014-01-31 12:11:23 +01:00
Jon Coppeard
50bf59a96c Bug 965904 - Fix some rooting hazards in the browser r=terrence 2014-01-31 09:56:40 +00:00
Jon Coppeard
ba27569312 Bug 959787 - Handlify JS_GetProperty and related APIs r=terrence r=bz 2014-01-31 09:55:20 +00:00
Jon Coppeard
e0514d8124 Bug 950931 - Re-enable disbaled jit tests r=terrence 2014-01-31 09:55:12 +00:00
Hannes Verschore
dc7726f7a3 Bug 964229 - IonMonkey: Split StringPolicy and support all primitives to MToString, r=jandem,sstangl 2014-01-31 10:24:02 +01:00
Richard Newman
a8d1e0fc12 Merge m-c to s-c. 2014-01-30 20:28:12 -08:00
Dagger
e1b5ca4be3 Bug 963937 - Add a pref to disable automatic bracket closing in source editor. r=anton 2014-01-30 20:21:00 -08:00
Matthew Noorenberghe
17bcbf3ddb Bug 958679 - UITour: Add the Accounts button within the Australis menu panel to the list of targets. r=Unfocused 2014-01-30 22:25:00 -08:00
Stephen Horlander
2cb35695c9 Bug 932235 - [Australis] New "Email Link" Icon. r=jaws 2014-01-31 00:37:33 -05:00
Mark Hammond
b867c97dfe Bug 966159 - Fix TypeError when trying to unlink account. r=ckarlof 2014-01-30 21:05:23 -08:00
Dale Harvey
3c5b896969 Bug 958666 - Disable autofocus on b2g. r=vingetun 2014-01-31 03:29:18 +00:00
Gavin Sharp
afbdf2585c Bug 966134: merge warning dialog should mention new email, not old email, and we should avoid storing the plaintext of signed-in users forever, r=markh
--HG--
extra : rebase_source : cee71c3201ee6fffc477d2cced50e0df567a0976
2014-01-30 19:05:24 -08:00
Gavin Sharp
e437d43475 Bug 966150: adjust wording/layout of new-sync preferences pane, r=ttaubert
--HG--
extra : rebase_source : 2736e75660a0def3561070f8f5e4d50f9de1e5cf
2014-01-30 20:37:43 -08:00
Chris Karlof
0fc62dc3fc Bug 966131 - On first sync set firstSync pref to resetClient instead of calling resetClient directly. r=markh 2014-01-30 20:19:48 -08:00
Mark Hammond
ab6595d56f Bug 966123 - have sync prefs listen for the onverified observer and update accordingly. t=ttaubert. 2014-01-30 20:07:49 -08:00
Nick Alexander
f9eccb0677 Bug 962126 - Strip debug logging and PII leaks from Android Firefox Accounts. r=rnewman 2014-01-30 18:00:29 -08:00
Nick Alexander
99a55b27d5 Bug 964795 - Update Accept-Language header to be spec-compliant. r=rnewman 2014-01-30 17:59:58 -08:00
Nick Alexander
a6fc1189b0 Bug 965867 - Update final URLs for Android Firefox Accounts landing. r=rnewman 2014-01-30 17:59:30 -08:00
Nick Alexander
c07cdccfb4 Bug 965366 - Make Firefox Account's StatusActivity checkboxes live. r=rnewman 2014-01-30 17:58:56 -08:00
Nick Alexander
cbe3deed81 Bug 965367 - Implement "Choose what to sync" check box. r=rnewman 2014-01-30 17:58:01 -08:00
Richard Newman
694d6e0850 Bug 966110 - Add formatS3 format string. r=trivial 2014-01-30 17:29:13 -08:00
Wes Kocher
c8a0ee314e Backed out 2 changesets (bug 950266) for making test_webapps_actor.html permaorange and mochitest-9's log permaoverflowing
Backed out changeset e3e75f44864b (bug 950266)
Backed out changeset 2963f15842fc (bug 950266)
2014-01-30 17:24:11 -08:00
B2G Bumper Bot
ad33e4df9e Bumping manifests a=b2g-bump 2014-01-30 16:30:55 -08:00
B2G Bumper Bot
6648ac4612 Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a7eca2fffd83
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 957714 - [Messages] Interacting with message field prevents recipients field from stealing focus (cursor jump) r=julienw

https://bugzilla.mozilla.org/show_bug.cgi?id=957714
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

========

https://hg.mozilla.org/integration/gaia-central/rev/d9127dcf6f00
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #15815 from davidflanagan/bug956811

Bug 956811: ugly workaround that abuses the settings db for interapp communication r=jporter

========

https://hg.mozilla.org/integration/gaia-central/rev/95e6a1054835
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 956811: ugly workaround that abuses the settings db for interapp communication
2014-01-30 16:30:10 -08:00
Tim Taubert
d1bf0905f5 Bug 963865 - [Australis] Fix browser_946320_tabs_from_other_computers.js to run with FxA enabled r=markh 2014-01-30 15:54:36 -08:00
B2G Bumper Bot
6767c8c7aa Bumping manifests a=b2g-bump 2014-01-30 13:51:38 -08:00
B2G Bumper Bot
44595a7a83 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5c3267470efd
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #15818 from julienw/965561-use-gaia-optimize-email-build

Bug 965561 - [email] default to not optimize if GAIA_OPTIMIZE=1 is not s...

========

https://hg.mozilla.org/integration/gaia-central/rev/7154646d7c59
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 965561 - [email] default to not optimize if GAIA_OPTIMIZE=1 is not set r=jrburke
2014-01-30 13:45:13 -08:00
Ryan VanderMeulen
15378cd13f Merge m-c to b2g-inbound. 2014-01-30 16:37:18 -05:00