Commit Graph

22322 Commits

Author SHA1 Message Date
Gijs Kruitbosch
24137f061b Merge mozilla-central and ux 2013-11-12 17:30:17 +01:00
Gijs Kruitbosch
af6f8f6fef Merge mozilla-central and ux 2013-11-12 09:27:50 +01:00
Gijs Kruitbosch
0c81a0b0ac Merge mozilla-central and ux 2013-11-11 22:41:49 +01:00
Gijs Kruitbosch
7fd8c018c3 Merge mozilla-central and ux 2013-11-11 09:29:29 +01:00
Matthew Noorenberghe
aba2581f1a Merge mozilla-central to UX 2013-11-09 17:46:29 -08:00
Jared Wein
8a50677a0d Automated merge with https://hg.mozilla.org/mozilla-central 2013-11-08 13:22:23 -05:00
Gijs Kruitbosch
2d25f5955d Merge mozilla-central and ux 2013-11-07 19:21:54 +00:00
Carsten "Tomcat" Book
debadf6309 merge fx-team to mozilla-central 2013-11-07 14:24:24 +01:00
Gijs Kruitbosch
63cb02d1d1 Merge mozilla-central and ux 2013-11-07 08:53:59 +01:00
Mike Hommey
f932a1fe70 Bug 862770 - Fix --disable-compile-environment a little. r=gps
--HG--
rename : config/makefiles/target_libs.mk => config/makefiles/target_binaries.mk
rename : js/src/config/makefiles/target_libs.mk => js/src/config/makefiles/target_binaries.mk
2013-11-07 10:37:45 +09:00
Mike Hommey
50e2fd01b1 Bug 935387 - Remove non recursed install targets. r=mshal 2013-11-07 10:37:45 +09:00
Gijs Kruitbosch
7f6c0c05d0 merge m-c to ux 2013-11-06 22:25:39 +01:00
Ryan VanderMeulen
57c88ce89f Merge fx-team to m-c. 2013-11-06 14:49:41 -05:00
Gijs Kruitbosch
7847dc3be9 Merge m-c to ux 2013-11-06 14:36:26 +01:00
Carsten "Tomcat" Book
591fd37a1b merge fx-team to mozilla-central 2013-11-06 13:09:28 +01:00
Gijs Kruitbosch
7211b5e0ad Merge mozilla-central and ux 2013-11-06 09:01:08 +01:00
Nick Fitzgerald
fb43b7e471 Bug 930141 - Replace escodegen with pretty-fast in the debugger and scratchpad pretty printing backend; r=gps,dcamp,past,benvie 2013-11-05 22:49:22 -08:00
Raymond Lee
092eb74ddd Bug 862179 - Implement asynchronous loading of search engines. r=gavin 2013-11-06 14:18:27 +08:00
David Rajchenbach-Teller
417ceab8ae Bug 932281 - Extend TelemetryHistogram.{id_offset, comment_offset} to uint32_t. r=froydnj 2013-11-06 09:02:29 -05:00
Paul Rouget
a8c629b8b1 Bug 914077 - Use rawNde() only if connection is not remote. r=bgrins 2013-11-06 09:02:09 -05:00
Anup
d3c6837851 Bug 468267 - Catch and report errors in search suggestions JSON response. r=gavin 2013-11-06 09:01:54 -05:00
Wes Kocher
a00a50d182 Merge m-c to inbound 2013-11-05 18:25:40 -08:00
Wes Kocher
e612f4f8f3 Merge fxteam to m-c 2013-11-05 17:38:24 -08:00
Ryan VanderMeulen
7a2924f392 Merge inbound to m-c. 2013-11-05 15:28:52 -05:00
Gijs Kruitbosch
4cb965f7aa Merge mozilla-central and ux 2013-11-05 20:14:58 +01:00
Kyle Huey
e034802efa Bug 919885: Move Worker to WebIDL and thread-agnostic event dispatch. r=bent,bz 2013-11-05 22:16:24 +08:00
Patrick Brosset
582fd8a44f Bug 932937 - Images are resized on the server-side for image preview tooltips. r=harth 2013-11-05 11:19:29 -05:00
Irving Reid
b9ffd5b8aa Bug 930548: collect more per-addon Telemetry details; r=unfocused 2013-11-05 10:41:14 -05:00
Carsten "Tomcat" Book
cffda8a9da merge mozilla-central to fx-team 2013-11-05 15:52:56 +01:00
Makoto Kato
e8ae36d2ca Bug 892856 - Protobuf fails to build in VS 2013. r=mmc 2013-11-05 15:54:30 +09:00
Wes Kocher
ce4f00fcbd Merge m-c to inbound 2013-11-04 21:22:23 -08:00
Wes Kocher
e400a12724 Merge inbound to m-c 2013-11-04 21:09:17 -08:00
Mike Hommey
3f65220584 Bug 934337 - Get rid of custom rules fiddling with SHARED_LIBRARY. r=mshal
While here, remove other custom rules in the same Makefiles.
2013-11-05 13:28:26 +09:00
Mike Hommey
aadf41e5e3 Bug 934361 - Remove CHROME_DEPS. r=mshal 2013-11-05 07:39:28 +09:00
Mike Hommey
78b32bd45d Bug 934360 - Remove GRE_MILESTONE computation from Makefiles. r=mshal 2013-11-05 07:39:28 +09:00
Alexandre Poirot
6d3005f1c2 Bug 933273 - Prevent loading AddonManager in webbrowser actor when not explicitely needed. r=nfitzgerald 2013-11-04 17:30:10 -05:00
Ryan VanderMeulen
d54baa4c91 Merge m-c to inbound. 2013-11-04 16:31:13 -05:00
Ryan VanderMeulen
3a4f8792df Merge inbound to m-c. 2013-11-04 16:16:22 -05:00
Matthew Noorenberghe
be474fa47a Merge mozilla-central to UX 2013-11-05 01:04:20 -08:00
Gijs Kruitbosch
7735c1ae5f Merge mozilla-central and ux 2013-11-04 23:41:59 +01:00
Gijs Kruitbosch
ca509a094b Merge mozilla-central and ux 2013-11-04 14:15:00 +01:00
Jared Wein
78c4c0995d Bug 933745 - Use the brand logo as the favicon for about:support. r=Unfocused 2013-11-04 01:00:01 -05:00
Sebastian Hengst
40f5bb9ed0 Bug 765285 - Include last 3 days of crash IDs in about:support: Improve localization comments. r=Mossop 2013-11-04 00:50:10 +01:00
Phil Ringnalda
b3c9b87d37 Merge f-t to m-c 2013-11-03 13:06:25 -08:00
Nick Fitzgerald
38f4dbdd3e Bug 932912 - Reflect.jsm should attach its export to 'this' so that it works in B2G; r=khuey 2013-11-02 12:54:08 -07:00
Tim Taubert
8af62f2f10 Bug 934207 - Add browser_thumbnails_background_crash.js to browser.ini r=jhammel,markh
From 866d4df33b0e9fd8b8a28eea4dfa690a10b7fa83 Mon Sep 17 00:00:00 2001
2013-11-02 20:35:38 +01:00
Phil Ringnalda
af558e50f1 Back out 5b70e599577c (bug 930141) for test_loader_paths.html bustage 2013-11-05 22:19:28 -08:00
Nick Fitzgerald
0466973b61 Bug 930141 - Replace escodegen with pretty-fast in the debugger and scratchpad pretty printing backend; r=gps,dcamp,past,benvie 2013-11-05 20:24:17 -08:00
Florian Quèze
3ac3032920 Bug 906839 - disable frameworker tests on ASAN builds, r=markh. 2013-11-05 13:06:23 +01:00
Ryan VanderMeulen
6d0dc845eb Backed out changesets f488602d26c9 and 09725c69fd76 (bug 860493) for OSX bustage.
CLOSED TREE
2013-11-04 12:55:56 -05:00
David Rajchenbach-Teller
e95ac6c38f Bug 860493 - Add telemetry for history swipe animations. r=spohl 2013-11-04 12:10:14 -05:00
Neil Deakin
f3270a29d5 Bug 596723, Don't consume clicks outside of arrow panels by default, always consume the clicks on anchors of all popups, r=dao,neil 2013-11-04 11:22:24 -05:00
J. Ryan Stinnett
e4cf0d1916 Bug 933083 - Refactor app requests into app-actor-front. r=ochameau 2013-11-01 16:41:19 -05:00
Wes Kocher
cd721fdff6 Backed out changeset 6cbc5a5a177f (bug 933646) for xpcshell bustage 2013-11-04 14:26:58 -08:00
Ryan VanderMeulen
d638624a4b Merge m-c to fx-team. 2013-11-04 16:33:35 -05:00
Ryan VanderMeulen
3f0ca7f5e4 Backed out changesets cf64922197ca, 3ae60bdf3fef, and 68960c6bdce3 (bug 906839) for ASAN mochitest-bc perma-orange. 2013-11-04 15:54:55 -05:00
Victor Porof
f27cddae88 Bug 933646 - Blackboxing a program in the shader editor should hide the rendered geometry, r=rcampbell 2013-11-04 22:48:10 +02:00
Benjamin Smedberg
feecbed02e Bug 932446 - in-content click-to-activate UI should look more clickable. Give the entire plugin a pointer cursor; reorder the vulnerable and activate sentences; underline the activate sentence so it looks like a clickable link; make the activate sentence red when :active so it also behaves more like a link, r=jaws ui-r=lco 2013-11-02 11:53:26 -04:00
Benjamin Smedberg
2ee5dadfec Bug 745187 - Don't introduce a delay notifying the frontend about new plugins added to the document, because script may immediately remove them from the page. To fix the delayed layout of XBL, introduce a separate method to calculate the notification icon visibility, r=jaws
Note: this patch still has one potential hole: if content creates a plugin and destroys it without forcing reflow, the XBL binding will not be instantiated. This doesn't appear to be a problem in practice, because every site that wants to use a plugin also has to trigger frame construction to get the plugin to instantiate (document.write of the embed element appears to do this automatically).
2013-11-02 11:53:26 -04:00
Dennis Schubert
9af4e3e887 Bug 921366 - Fix output for throw false/0/null/undefined in Scratchpad; r=msucan 2013-11-01 18:03:30 +02:00
Wes Kocher
e6e5c2e310 Merge inbound to m-c 2013-11-01 20:34:44 -07:00
Mike Hommey
bc3f1629f6 Bug 933097 - Remove a few useless moz.build files. r=mshal 2013-11-02 08:47:46 +09:00
Mike Hommey
00a70f6f7d Bug 933120 - Move HOST_PROGRAM and HOST_SIMPLE_PROGRAMS to moz.build. r=gps 2013-11-02 08:44:11 +09:00
Mike Hommey
3da504d65e Bug 933135 - Treat SIMPLE_PROGRAMS more like PROGRAM. r=mshal 2013-11-02 08:43:55 +09:00
Mike Hommey
8b474dc32b Bug 933100 - Cleanup toolkit/mozapps/plugins/tests/Makefile.in. r=gps 2013-11-02 08:43:43 +09:00
Gijs Kruitbosch
adc9c274bb Merge mozilla-central and ux 2013-11-03 23:36:57 +01:00
Gijs Kruitbosch
b035f59a74 Merge mozilla-central and ux 2013-11-02 11:33:53 +01:00
Gijs Kruitbosch
ad9e61fa26 Merge mozilla-central and ux 2013-11-01 23:24:47 +01:00
Ryan VanderMeulen
43eeed0ee4 Merge fx-team to m-c. 2013-11-01 14:51:36 -04:00
Gijs Kruitbosch
727205ff4e Merge mozilla-central and ux 2013-11-01 19:51:09 +01:00
Gijs Kruitbosch
f298c06fde Merge mozilla-central and ux 2013-11-01 09:20:15 +01:00
Panos Astithas
bfc1ea5539 Bug 932880 - Make preNest/postNest not throw when the browser is abruptly shut down. r=rcampbell 2013-10-31 23:10:22 +02:00
Ed Morley
febfa6a288 Merge mozilla-central and fx-team 2013-11-01 13:19:18 +00:00
Ed Morley
c2e9f503ed Backed out changeset ebe4f507a5ac (bug 725943) for frequent failures in test_serialize_file.js 2013-11-01 12:04:23 +00:00
Ryan VanderMeulen
da0792e78f Merge m-c to inbound on a CLOSED TREE. 2013-10-31 16:10:29 -04:00
Carsten "Tomcat" Book
3f22c5643c merge mozilla-central to mozilla-inbound 2013-11-06 14:55:48 +01:00
Jon Coppeard
05c372420a Bug 927930 - Make nsJSInspector cycle collected as it has JS::Value members r=jimb r=smaug 2013-11-06 10:45:59 +00:00
Nathan Froyd
401d6b3706 Bug 933071 - add --with-macos-private-frameworks to support cross-compiling; r=mshal 2013-10-31 09:50:26 -04:00
Brian Grinstead
d0fd168866 Bug 932880: Developer tools leak many windows until shutdown in browser-chrome tests. r=anton CLOSED TREE 2013-10-30 20:29:06 -05:00
Ryan VanderMeulen
1d57260a86 Merge m-c to inbound on a CLOSED TREE. 2013-10-30 22:42:13 -04:00
Ryan VanderMeulen
a4511eaf5f Merge b2g-inbound to m-c on a CLOSED TREE. 2013-10-30 22:36:56 -04:00
Mark Hammond
a2da521ebd Bug 906839 - disable one social test due to bug 919878. r=gavin 2013-10-31 10:59:36 +11:00
Shane Caraveo
b9249bfeef Bug 906839 - enable by default social.allowMultipleWorkers - update tests to work pref'd on and fix a missing update to the worker state, r=markh. 2013-10-31 10:59:35 +11:00
Nick Fitzgerald
3c6f59727a Bug 918053 - TA__discoverSources should use Debugger.Source; r=past 2013-11-05 12:59:33 -08:00
Ryan VanderMeulen
5ad128c13d Merge m-c to fx-team. 2013-11-05 15:38:24 -05:00
Kyle Huey
5cb5fbcbed Bug 932867 - FrameWorker should remove the iframe not the browser. r=smaug CLOSED TREE 2013-10-30 10:56:55 -07:00
Wes Kocher
9e8ba0656b Backed out changeset 4a21dc77dad9 (bug 932280) for inexplicably breaking win7debug browser-chrome tests on a CLOSED TREE 2013-10-29 17:19:15 -07:00
Dave Camp
960780453b Bug 897194: Use outer window ID to match toolbox to tab rather than assuming the currently-selected tab. r=bgrins 2013-10-29 10:47:16 -07:00
Matthew Gregan
36a1e81bf8 Bug 837563 - Enable libcubeb's PulseAudio backend. r=glandium 2013-10-31 11:37:28 +13:00
Philipp Kewisch
2842a71269 Fix bug 927073 - Binary compatibility broken for maintenance releases due to strict version-script. r=glandium 2013-10-29 21:48:28 +01:00
Tom Schuster
a005f872ae Bug 928619 - Stop removing the findbar selection after it closes. r=mikedeboer 2013-10-29 20:28:51 +01:00
Oleg Romashin
d6e4b452a3 Bug 932280 - [Qt] Move moc_ files to Makefile.in in order to pass existance check for autogenerated files. r=Ms2ger 2013-10-29 07:56:53 -07:00
Carsten "Tomcat" Book
968fa82d4a Merge Fx-team to Mozilla-Central 2013-10-29 13:22:29 +01:00
Phil Ringnalda
bbffd1ef44 Merge m-c to f-t 2013-10-28 17:13:23 -07:00
Brian R. Bondy
de45bd4422 Bug 922756 - Build config for Chromium sandbox. r=bsmedberg
--HG--
rename : security/sandbox/LICENSE => security/sandbox/linux/LICENSE
rename : security/sandbox/Makefile.in => security/sandbox/linux/Makefile.in
rename : security/sandbox/Sandbox.cpp => security/sandbox/linux/Sandbox.cpp
rename : security/sandbox/Sandbox.h => security/sandbox/linux/Sandbox.h
rename : security/sandbox/android_arm_ucontext.h => security/sandbox/linux/android_arm_ucontext.h
rename : security/sandbox/android_i386_ucontext.h => security/sandbox/linux/android_i386_ucontext.h
rename : security/sandbox/android_ucontext.h => security/sandbox/linux/android_ucontext.h
rename : security/sandbox/arm_linux_syscalls.h => security/sandbox/linux/arm_linux_syscalls.h
rename : security/sandbox/linux_seccomp.h => security/sandbox/linux/linux_seccomp.h
rename : security/sandbox/linux_syscalls.h => security/sandbox/linux/linux_syscalls.h
rename : security/sandbox/moz.build => security/sandbox/linux/moz.build
rename : security/sandbox/seccomp_filter.h => security/sandbox/linux/seccomp_filter.h
rename : security/sandbox/x86_32_linux_syscalls.h => security/sandbox/linux/x86_32_linux_syscalls.h
rename : security/sandbox/x86_64_linux_syscalls.h => security/sandbox/linux/x86_64_linux_syscalls.h
2013-10-28 14:54:36 -07:00
Ed Morley
e41de6bffe Merge mozilla-central and inbound 2013-10-28 18:36:22 +00:00
Ed Morley
65f9bfcf89 Bug 637806 - Disable test_titlebar.xul on Linux for too many intermittent failures
--HG--
extra : transplant_source : %8A%BEZU%22%F8%FC%A3%91d%5CR%10%B1%40%F9N%D4%40%8F
2013-10-28 15:39:01 +00:00
Ed Morley
4cfd7400c3 Bug 931889 - Disable browser_thumbnails_background.js on Linux for too many intermittent failures 2013-10-28 17:01:51 +00:00
Sebastian Hengst
1429aa2e75 Bug 765285 - Include last 3 days of crash IDs in about:support. r=Mossop,dolske 2013-10-28 00:18:14 +01:00
Carsten "Tomcat" Book
a2944563d3 Merge Fx-team to Mozilla-Central 2013-10-28 10:04:41 +01:00
Carsten "Tomcat" Book
36cc951bba Merge Mozilla-Inbound to Mozilla-Central 2013-10-28 10:03:25 +01:00
Robert Strong
3c12dc5317 Bug 931586 - Use FileUtils.PERMS_DIRECTORY instead of 0755 in nsUpdateService.js. r=bbondy 2013-10-27 19:27:21 -07:00
Phil Ringnalda
7ea667e461 Merge m-c to f-t 2013-10-27 19:26:05 -07:00
Nils Maier
2901e2256a Bug 912457 - Expose async |flush()| in OS.File. r=yoric 2013-10-27 19:03:25 -04:00
Jim Blandy
de155cd5b4 Bug 919349: Remove infelicitous uses of 'delete' from the JavaScript debugger server. r=dcamp 2013-10-27 11:03:20 -07:00
Phil Ringnalda
1a9ee616c1 Merge f-t to m-c 2013-10-27 10:22:27 -07:00
Tareq Khandaker
29d7a9976d Bug 926635 - Improve layout of uncaught Promise.jsm error messages. r=Yoric 2013-10-27 08:03:51 -04:00
Nils Maier
9829ff2c09 Bug 924858 - Part 2: Implement |append| mode for OS.File.open on Windows. r=yoric 2013-10-27 08:03:35 -04:00
Nils Maier
8d9544a179 Bug 924858 - Part 1: Add |append| mode flag to OS.File.open on Unix. r=yoric
To match previous behavior, this mode flag will default to |true|.
2013-10-27 08:03:16 -04:00
Mike Hommey
2cb9e36037 Bug 938017 - Remove dlldeps-*.cpp and nsGFXDeps.cpp. r=bsmedberg 2013-11-16 13:38:37 +09:00
Mike Hommey
294db4b946 Bug 937359 - Make all objects built into xul.dll built with -MD/-MDd, not -MT/-MTd. r=bsmedberg
--HG--
rename : toolkit/mozapps/update/common/Makefile.in => toolkit/mozapps/update/common-standalone/Makefile.in
2013-11-16 13:37:56 +09:00
Mike Hommey
3dcc53299a Bug 937526 - Cleanup unicharutil/util and rdf/util related things. r=gps 2013-11-16 13:37:54 +09:00
Brian R. Bondy
b8efeb8ff8 Bug 935980 - Move Windows sandbox makefiles out of accessibility block. r=glandium 2013-11-16 13:37:52 +09:00
Stephen Pohl
b4e8ea7017 Bug 938189 - Add telemetry for kicking off snapshot compression. r=felipe 2013-11-15 21:46:40 -05:00
Akshay Aurora
e09da9fcaf Bug 926489 - Replace className with classList. r=dao 2013-10-26 02:41:02 +05:30
Ed Morley
07c7ff2f6f Bug 637806 - Disable test_titlebar.xul on Linux for too many intermittent failures 2013-10-28 15:39:01 +00:00
Nathan Froyd
a59022ab0e Bug 931053 - don't build Mac host tools if --disable-crashreporter; r=ted 2013-10-25 11:49:26 -04:00
Henri Sivonen
5ac2a5be04 Bug 910192 non-UI part - Get rid of intl.charset.default as a localizable pref and deduce the fallback from the locale. r=bzbarsky. 2013-11-04 13:24:33 +02:00
Ed Morley
8dd27dbba6 Bug 919016 - Disable test_privbrowsing_perwindowpb.html on Windows for too many intermittent failures 2013-11-04 13:35:29 +00:00
Carsten "Tomcat" Book
6646962e49 Backed out changeset 88e0c01e2d81 (bug 910192) bustage on a CLOSED TREE 2013-11-04 13:04:02 +01:00
Henri Sivonen
7af818f242 Bug 910192 non-UI part - Get rid of intl.charset.default as a localizable pref and deduce the fallback from the locale. r=bzbarsky. 2013-11-04 13:24:33 +02:00
Robert Strong
25ba0a7fd8 Bug 941397 - Progress message on Firefox Stub install for Japanese and other languages that don't break words with spaces. r=bbondy 2013-11-22 13:28:24 -08:00
Raymond Lee
b420bd9fc0 Bug 875731 - /toolkit/content/ Replace callers of nsIDownloadManager.usersDownloadsDirectory with Downloads.getUserDownloadsDirectory. r=paolo 2013-10-25 14:03:18 +08:00
Robert Strong
52a0fd57e1 Bug 931267 - Convert deprecated octal literals in FileUtils.jsm. r=bbondy 2013-10-26 14:30:45 -07:00
Robert Strong
e319efe70c Bug 931410 - Increase test default timeout for app update chrome tests. r=bbondy 2013-10-26 14:29:17 -07:00
Robert Strong
9c1c31e987 Bug 914321 - Disable test_0102_background_restartNotification_staging.xul on Linux due to Intermittent timeout caused by copying all of the files in dist/bin 2013-10-26 13:36:27 -07:00
Robert Strong
454e5144f2 Bug 931216 - Convert deprecated octal literals in app update xpcshell tests. r=bbondy 2013-10-26 13:36:11 -07:00
Phil Ringnalda
c1d89249f6 Merge f-t to m-c 2013-10-26 11:17:15 -07:00
Phil Ringnalda
6c35fe73d2 Merge m-c to f-t 2013-10-25 19:53:31 -07:00
Phil Ringnalda
b6d2006807 Merge m-c to m-i 2013-10-25 19:52:22 -07:00
Phil Ringnalda
79607bc952 Merge f-t to m-c 2013-10-25 19:24:55 -07:00
Robert Strong
93c8cfffb2 App update test only changes and build changes for tests. Reorganize app update test structure and remove unneeded Makefiles and moz.build files for Bug 929149. r=bbondy, r=gps for build changes
--HG--
rename : toolkit/mozapps/update/test/Makefile.in => toolkit/mozapps/update/tests/Makefile.in
rename : toolkit/mozapps/update/test/TestAUSHelper.cpp => toolkit/mozapps/update/tests/TestAUSHelper.cpp
rename : toolkit/mozapps/update/test/TestAUSReadStrings.cpp => toolkit/mozapps/update/tests/TestAUSReadStrings.cpp
rename : toolkit/mozapps/update/test/TestAUSReadStrings1.ini => toolkit/mozapps/update/tests/TestAUSReadStrings1.ini
rename : toolkit/mozapps/update/test/TestAUSReadStrings2.ini => toolkit/mozapps/update/tests/TestAUSReadStrings2.ini
rename : toolkit/mozapps/update/test/TestAUSReadStrings3.ini => toolkit/mozapps/update/tests/TestAUSReadStrings3.ini
rename : toolkit/mozapps/update/test/chrome/chrome.ini => toolkit/mozapps/update/tests/chrome/chrome.ini
rename : toolkit/mozapps/update/test/chrome/test_0011_check_basic.xul => toolkit/mozapps/update/tests/chrome/test_0011_check_basic.xul
rename : toolkit/mozapps/update/test/chrome/test_0012_check_basic_license.xul => toolkit/mozapps/update/tests/chrome/test_0012_check_basic_license.xul
rename : toolkit/mozapps/update/test/chrome/test_0013_check_incompat_basic.xul => toolkit/mozapps/update/tests/chrome/test_0013_check_incompat_basic.xul
rename : toolkit/mozapps/update/test/chrome/test_0014_check_incompat_basic_license.xul => toolkit/mozapps/update/tests/chrome/test_0014_check_incompat_basic_license.xul
rename : toolkit/mozapps/update/test/chrome/test_0015_check_incompat_basic_addons.xul => toolkit/mozapps/update/tests/chrome/test_0015_check_incompat_basic_addons.xul
rename : toolkit/mozapps/update/test/chrome/test_0016_check_incompat_basic_license_addons.xul => toolkit/mozapps/update/tests/chrome/test_0016_check_incompat_basic_license_addons.xul
rename : toolkit/mozapps/update/test/chrome/test_0017_check_staging_basic.xul => toolkit/mozapps/update/tests/chrome/test_0017_check_staging_basic.xul
rename : toolkit/mozapps/update/test/chrome/test_0021_check_billboard.xul => toolkit/mozapps/update/tests/chrome/test_0021_check_billboard.xul
rename : toolkit/mozapps/update/test/chrome/test_0022_check_billboard_license.xul => toolkit/mozapps/update/tests/chrome/test_0022_check_billboard_license.xul
rename : toolkit/mozapps/update/test/chrome/test_0023_check_incompat_billboard.xul => toolkit/mozapps/update/tests/chrome/test_0023_check_incompat_billboard.xul
rename : toolkit/mozapps/update/test/chrome/test_0024_check_incompat_billboard_license.xul => toolkit/mozapps/update/tests/chrome/test_0024_check_incompat_billboard_license.xul
rename : toolkit/mozapps/update/test/chrome/test_0025_check_incompat_billboard_addons.xul => toolkit/mozapps/update/tests/chrome/test_0025_check_incompat_billboard_addons.xul
rename : toolkit/mozapps/update/test/chrome/test_0026_check_incompat_billboard_license_addons.xul => toolkit/mozapps/update/tests/chrome/test_0026_check_incompat_billboard_license_addons.xul
rename : toolkit/mozapps/update/test/chrome/test_0031_available_basic.xul => toolkit/mozapps/update/tests/chrome/test_0031_available_basic.xul
rename : toolkit/mozapps/update/test/chrome/test_0032_available_basic_license.xul => toolkit/mozapps/update/tests/chrome/test_0032_available_basic_license.xul
rename : toolkit/mozapps/update/test/chrome/test_0033_available_incompat_basic.xul => toolkit/mozapps/update/tests/chrome/test_0033_available_incompat_basic.xul
rename : toolkit/mozapps/update/test/chrome/test_0034_available_incompat_basic_license.xul => toolkit/mozapps/update/tests/chrome/test_0034_available_incompat_basic_license.xul
rename : toolkit/mozapps/update/test/chrome/test_0035_available_incompat_basic_addons.xul => toolkit/mozapps/update/tests/chrome/test_0035_available_incompat_basic_addons.xul
rename : toolkit/mozapps/update/test/chrome/test_0036_available_incompat_basic_license_addons.xul => toolkit/mozapps/update/tests/chrome/test_0036_available_incompat_basic_license_addons.xul
rename : toolkit/mozapps/update/test/chrome/test_0041_available_billboard.xul => toolkit/mozapps/update/tests/chrome/test_0041_available_billboard.xul
rename : toolkit/mozapps/update/test/chrome/test_0042_available_billboard_license.xul => toolkit/mozapps/update/tests/chrome/test_0042_available_billboard_license.xul
rename : toolkit/mozapps/update/test/chrome/test_0043_available_incompat_billboard.xul => toolkit/mozapps/update/tests/chrome/test_0043_available_incompat_billboard.xul
rename : toolkit/mozapps/update/test/chrome/test_0044_available_incompat_billboard_license.xul => toolkit/mozapps/update/tests/chrome/test_0044_available_incompat_billboard_license.xul
rename : toolkit/mozapps/update/test/chrome/test_0045_available_incompat_billboard_addons.xul => toolkit/mozapps/update/tests/chrome/test_0045_available_incompat_billboard_addons.xul
rename : toolkit/mozapps/update/test/chrome/test_0046_available_incompat_billboard_license_addons.xul => toolkit/mozapps/update/tests/chrome/test_0046_available_incompat_billboard_license_addons.xul
rename : toolkit/mozapps/update/test/chrome/test_0051_check_error_xml_malformed.xul => toolkit/mozapps/update/tests/chrome/test_0051_check_error_xml_malformed.xul
rename : toolkit/mozapps/update/test/chrome/test_0052_check_no_updates.xul => toolkit/mozapps/update/tests/chrome/test_0052_check_no_updates.xul
rename : toolkit/mozapps/update/test/chrome/test_0053_check_billboard_license_noAttr.xul => toolkit/mozapps/update/tests/chrome/test_0053_check_billboard_license_noAttr.xul
rename : toolkit/mozapps/update/test/chrome/test_0054_check_billboard_license_404.xul => toolkit/mozapps/update/tests/chrome/test_0054_check_billboard_license_404.xul
rename : toolkit/mozapps/update/test/chrome/test_0061_check_verifyFailPartial_noComplete.xul => toolkit/mozapps/update/tests/chrome/test_0061_check_verifyFailPartial_noComplete.xul
rename : toolkit/mozapps/update/test/chrome/test_0062_check_verifyFailComplete_noPartial.xul => toolkit/mozapps/update/tests/chrome/test_0062_check_verifyFailComplete_noPartial.xul
rename : toolkit/mozapps/update/test/chrome/test_0063_check_verifyFailPartialComplete.xul => toolkit/mozapps/update/tests/chrome/test_0063_check_verifyFailPartialComplete.xul
rename : toolkit/mozapps/update/test/chrome/test_0064_check_verifyFailPartial_successComplete.xul => toolkit/mozapps/update/tests/chrome/test_0064_check_verifyFailPartial_successComplete.xul
rename : toolkit/mozapps/update/test/chrome/test_0071_notify_verifyFailPartial_noComplete.xul => toolkit/mozapps/update/tests/chrome/test_0071_notify_verifyFailPartial_noComplete.xul
rename : toolkit/mozapps/update/test/chrome/test_0072_notify_verifyFailComplete_noPartial.xul => toolkit/mozapps/update/tests/chrome/test_0072_notify_verifyFailComplete_noPartial.xul
rename : toolkit/mozapps/update/test/chrome/test_0073_notify_verifyFailPartialComplete.xul => toolkit/mozapps/update/tests/chrome/test_0073_notify_verifyFailPartialComplete.xul
rename : toolkit/mozapps/update/test/chrome/test_0074_notify_verifyFailPartial_successComplete.xul => toolkit/mozapps/update/tests/chrome/test_0074_notify_verifyFailPartial_successComplete.xul
rename : toolkit/mozapps/update/test/chrome/test_0081_error_patchApplyFailure_partial_only.xul => toolkit/mozapps/update/tests/chrome/test_0081_error_patchApplyFailure_partial_only.xul
rename : toolkit/mozapps/update/test/chrome/test_0082_error_patchApplyFailure_complete_only.xul => toolkit/mozapps/update/tests/chrome/test_0082_error_patchApplyFailure_complete_only.xul
rename : toolkit/mozapps/update/test/chrome/test_0083_error_patchApplyFailure_partial_complete.xul => toolkit/mozapps/update/tests/chrome/test_0083_error_patchApplyFailure_partial_complete.xul
rename : toolkit/mozapps/update/test/chrome/test_0084_error_patchApplyFailure_verify_failed.xul => toolkit/mozapps/update/tests/chrome/test_0084_error_patchApplyFailure_verify_failed.xul
rename : toolkit/mozapps/update/test/chrome/test_0091_installed.xul => toolkit/mozapps/update/tests/chrome/test_0091_installed.xul
rename : toolkit/mozapps/update/test/chrome/test_0092_finishedBackground.xul => toolkit/mozapps/update/tests/chrome/test_0092_finishedBackground.xul
rename : toolkit/mozapps/update/test/chrome/test_0093_restartNotification.xul => toolkit/mozapps/update/tests/chrome/test_0093_restartNotification.xul
rename : toolkit/mozapps/update/test/chrome/test_0094_restartNotification_remote.xul => toolkit/mozapps/update/tests/chrome/test_0094_restartNotification_remote.xul
rename : toolkit/mozapps/update/test/chrome/test_0095_restartNotification_remoteInvalidNumber.xul => toolkit/mozapps/update/tests/chrome/test_0095_restartNotification_remoteInvalidNumber.xul
rename : toolkit/mozapps/update/test/chrome/test_0096_restartNotification_stagedBackground.xul => toolkit/mozapps/update/tests/chrome/test_0096_restartNotification_stagedBackground.xul
rename : toolkit/mozapps/update/test/chrome/test_0097_restartNotification_stagedServiceBackground.xul => toolkit/mozapps/update/tests/chrome/test_0097_restartNotification_stagedServiceBackground.xul
rename : toolkit/mozapps/update/test/chrome/test_0101_background_restartNotification.xul => toolkit/mozapps/update/tests/chrome/test_0101_background_restartNotification.xul
rename : toolkit/mozapps/update/test/chrome/test_0102_background_restartNotification_staging.xul => toolkit/mozapps/update/tests/chrome/test_0102_background_restartNotification_staging.xul
rename : toolkit/mozapps/update/test/chrome/test_0103_background_restartNotification_stagingService.xul => toolkit/mozapps/update/tests/chrome/test_0103_background_restartNotification_stagingService.xul
rename : toolkit/mozapps/update/test/chrome/test_0111_neverButton_basic.xul => toolkit/mozapps/update/tests/chrome/test_0111_neverButton_basic.xul
rename : toolkit/mozapps/update/test/chrome/test_0112_neverButton_billboard.xul => toolkit/mozapps/update/tests/chrome/test_0112_neverButton_billboard.xul
rename : toolkit/mozapps/update/test/chrome/test_0113_showNeverForVersionRemovedWithPref.xul => toolkit/mozapps/update/tests/chrome/test_0113_showNeverForVersionRemovedWithPref.xul
rename : toolkit/mozapps/update/test/chrome/test_0121_check_requireBuiltinCert.xul => toolkit/mozapps/update/tests/chrome/test_0121_check_requireBuiltinCert.xul
rename : toolkit/mozapps/update/test/chrome/test_0122_check_allowNonBuiltinCert_validCertAttrs.xul => toolkit/mozapps/update/tests/chrome/test_0122_check_allowNonBuiltinCert_validCertAttrs.xul
rename : toolkit/mozapps/update/test/chrome/test_0123_check_allowNonBuiltinCert_noCertAttrsCheck.xul => toolkit/mozapps/update/tests/chrome/test_0123_check_allowNonBuiltinCert_noCertAttrsCheck.xul
rename : toolkit/mozapps/update/test/chrome/test_0131_check_invalidCertAttrs_noUpdate.xul => toolkit/mozapps/update/tests/chrome/test_0131_check_invalidCertAttrs_noUpdate.xul
rename : toolkit/mozapps/update/test/chrome/test_0132_check_invalidCertAttrs_hasUpdate.xul => toolkit/mozapps/update/tests/chrome/test_0132_check_invalidCertAttrs_hasUpdate.xul
rename : toolkit/mozapps/update/test/chrome/test_0141_notify_invalidCertAttrs_noUpdate.xul => toolkit/mozapps/update/tests/chrome/test_0141_notify_invalidCertAttrs_noUpdate.xul
rename : toolkit/mozapps/update/test/chrome/test_0142_notify_invalidCertAttrs_hasUpdate.xul => toolkit/mozapps/update/tests/chrome/test_0142_notify_invalidCertAttrs_hasUpdate.xul
rename : toolkit/mozapps/update/test/chrome/test_0151_notify_backgroundCheckError.xul => toolkit/mozapps/update/tests/chrome/test_0151_notify_backgroundCheckError.xul
rename : toolkit/mozapps/update/test/chrome/test_0161_check_unsupported.xul => toolkit/mozapps/update/tests/chrome/test_0161_check_unsupported.xul
rename : toolkit/mozapps/update/test/chrome/test_0162_notify_unsupported.xul => toolkit/mozapps/update/tests/chrome/test_0162_notify_unsupported.xul
rename : toolkit/mozapps/update/test/chrome/test_0900_deprecatedUpdateFormat_minor.xul => toolkit/mozapps/update/tests/chrome/test_0900_deprecatedUpdateFormat_minor.xul
rename : toolkit/mozapps/update/test/chrome/test_0901_deprecatedUpdateFormat_major.xul => toolkit/mozapps/update/tests/chrome/test_0901_deprecatedUpdateFormat_major.xul
rename : toolkit/mozapps/update/test/chrome/test_9999_cleanup.xul => toolkit/mozapps/update/tests/chrome/test_9999_cleanup.xul
rename : toolkit/mozapps/update/test/chrome/update.sjs => toolkit/mozapps/update/tests/chrome/update.sjs
rename : toolkit/mozapps/update/test/chrome/utils.js => toolkit/mozapps/update/tests/chrome/utils.js
rename : toolkit/mozapps/update/test/unit/data/complete.mar => toolkit/mozapps/update/tests/data/complete.mar
rename : toolkit/mozapps/update/test/unit/data/complete.png => toolkit/mozapps/update/tests/data/complete.png
rename : toolkit/mozapps/update/test/unit/data/complete_cc_log_switch_success => toolkit/mozapps/update/tests/data/complete_cc_log_switch_success
rename : toolkit/mozapps/update/test/unit/data/complete_log_success => toolkit/mozapps/update/tests/data/complete_log_success
rename : toolkit/mozapps/update/test/unit/data/complete_log_switch_success => toolkit/mozapps/update/tests/data/complete_log_switch_success
rename : toolkit/mozapps/update/test/unit/data/complete_precomplete => toolkit/mozapps/update/tests/data/complete_precomplete
rename : toolkit/mozapps/update/test/unit/data/complete_removed-files => toolkit/mozapps/update/tests/data/complete_removed-files
rename : toolkit/mozapps/update/test/unit/data/complete_update_manifest => toolkit/mozapps/update/tests/data/complete_update_manifest
rename : toolkit/mozapps/update/test/unit/data/complete_win.mar => toolkit/mozapps/update/tests/data/complete_win.mar
rename : toolkit/mozapps/update/test/unit/data/old_version_mar.mar => toolkit/mozapps/update/tests/data/old_version.mar
rename : toolkit/mozapps/update/test/unit/data/partial.mar => toolkit/mozapps/update/tests/data/partial.mar
rename : toolkit/mozapps/update/test/unit/data/partial.png => toolkit/mozapps/update/tests/data/partial.png
rename : toolkit/mozapps/update/test/unit/data/partial_in_use_win_after.exe => toolkit/mozapps/update/tests/data/partial_in_use_win_after.exe
rename : toolkit/mozapps/update/test/unit/data/partial_in_use_win_before.exe => toolkit/mozapps/update/tests/data/partial_in_use_win_before.exe
rename : toolkit/mozapps/update/test/unit/data/partial_log_failure => toolkit/mozapps/update/tests/data/partial_log_failure
rename : toolkit/mozapps/update/test/unit/data/partial_log_success => toolkit/mozapps/update/tests/data/partial_log_success
rename : toolkit/mozapps/update/test/unit/data/partial_log_switch_success => toolkit/mozapps/update/tests/data/partial_log_switch_success
rename : toolkit/mozapps/update/test/unit/data/partial_precomplete => toolkit/mozapps/update/tests/data/partial_precomplete
rename : toolkit/mozapps/update/test/unit/data/partial_removed-files => toolkit/mozapps/update/tests/data/partial_removed-files
rename : toolkit/mozapps/update/test/unit/data/partial_update_manifest => toolkit/mozapps/update/tests/data/partial_update_manifest
rename : toolkit/mozapps/update/test/unit/data/partial_win.mar => toolkit/mozapps/update/tests/data/partial_win.mar
rename : toolkit/mozapps/update/test/unit/data/simple.mar => toolkit/mozapps/update/tests/data/simple.mar
rename : toolkit/mozapps/update/test/unit/data/simple_no_pib.mar => toolkit/mozapps/update/tests/data/simple_no_pib.mar
rename : toolkit/mozapps/update/test/unit/data/wrong_product_channel_mar.mar => toolkit/mozapps/update/tests/data/wrong_product_channel.mar
rename : toolkit/mozapps/update/test/marionette/data/bad.xml => toolkit/mozapps/update/tests/marionette/data/bad.xml
rename : toolkit/mozapps/update/test/marionette/data/err.cgi => toolkit/mozapps/update/tests/marionette/data/err.cgi
rename : toolkit/mozapps/update/test/marionette/update-smoketests.ini => toolkit/mozapps/update/tests/marionette/update-smoketests.ini
rename : toolkit/mozapps/update/test/marionette/update-tests.ini => toolkit/mozapps/update/tests/marionette/update-tests.ini
rename : toolkit/mozapps/update/test/marionette/update_smoketest_ota_same_version.js => toolkit/mozapps/update/tests/marionette/update_smoketest_ota_same_version.js
rename : toolkit/mozapps/update/test/marionette/update_smoketest_ota_same_version.py => toolkit/mozapps/update/tests/marionette/update_smoketest_ota_same_version.py
rename : toolkit/mozapps/update/test/marionette/update_smoketest_ota_simple.js => toolkit/mozapps/update/tests/marionette/update_smoketest_ota_simple.js
rename : toolkit/mozapps/update/test/marionette/update_smoketest_ota_simple.py => toolkit/mozapps/update/tests/marionette/update_smoketest_ota_simple.py
rename : toolkit/mozapps/update/test/marionette/update_test_ota_simple.js => toolkit/mozapps/update/tests/marionette/update_test_ota_simple.js
rename : toolkit/mozapps/update/test/marionette/update_test_ota_simple.py => toolkit/mozapps/update/tests/marionette/update_test_ota_simple.py
rename : toolkit/mozapps/update/test/marionette/update_test_status.js => toolkit/mozapps/update/tests/marionette/update_test_status.js
rename : toolkit/mozapps/update/test/marionette/update_test_status.py => toolkit/mozapps/update/tests/marionette/update_test_status.py
rename : toolkit/mozapps/update/test/moz.build => toolkit/mozapps/update/tests/moz.build
rename : toolkit/mozapps/update/test/shared.js => toolkit/mozapps/update/tests/shared.js
rename : toolkit/mozapps/update/test/sharedUpdateXML.js => toolkit/mozapps/update/tests/sharedUpdateXML.js
rename : toolkit/mozapps/update/test/unit/test_0010_general.js => toolkit/mozapps/update/tests/unit_aus_update/canCheckForAndCanApplyUpdates.js
rename : toolkit/mozapps/update/test/unit/test_0063_manager.js => toolkit/mozapps/update/tests/unit_aus_update/cleanupDownloadingForDifferentChannel.js
rename : toolkit/mozapps/update/test/unit/test_0061_manager.js => toolkit/mozapps/update/tests/unit_aus_update/cleanupDownloadingForOlderAppVersion.js
rename : toolkit/mozapps/update/test/unit/test_0064_manager.js => toolkit/mozapps/update/tests/unit_aus_update/cleanupDownloadingForSameVersionAndBuildID.js
rename : toolkit/mozapps/update/test/unit/test_0072_update_dir_cleanup.js => toolkit/mozapps/update/tests/unit_aus_update/cleanupDownloadingIncorrectStatus.js
rename : toolkit/mozapps/update/test/unit/test_0073_update_dir_cleanup.js => toolkit/mozapps/update/tests/unit_aus_update/cleanupPendingVersionFileIncorrectStatus.js
rename : toolkit/mozapps/update/test/unit/test_0070_update_dir_cleanup.js => toolkit/mozapps/update/tests/unit_aus_update/cleanupSuccessLogMove.js
rename : toolkit/mozapps/update/test/unit/test_0071_update_dir_cleanup.js => toolkit/mozapps/update/tests/unit_aus_update/cleanupSuccessLogsFIFO.js
rename : toolkit/mozapps/update/test/unit/test_bug595059.js => toolkit/mozapps/update/tests/unit_aus_update/downloadCompleteAfterPartialFailure.js
rename : toolkit/mozapps/update/test/unit/test_bug833708.js => toolkit/mozapps/update/tests/unit_aus_update/downloadFileTooBig_gonk.js
rename : toolkit/mozapps/update/test/unit/test_bug794211.js => toolkit/mozapps/update/tests/unit_aus_update/downloadInterruptedByOfflineRetry.js
rename : toolkit/mozapps/update/test/unit/test_0030_general.js => toolkit/mozapps/update/tests/unit_aus_update/downloadMar.js
rename : toolkit/mozapps/update/test/unit/test_0062_manager.js => toolkit/mozapps/update/tests/unit_aus_update/downloadResumeForSameAppVersion.js
rename : toolkit/mozapps/update/test/unit/head_update.js.in => toolkit/mozapps/update/tests/unit_aus_update/head_update.js
rename : toolkit/mozapps/update/test/unit/test_0020_general.js => toolkit/mozapps/update/tests/unit_aus_update/remoteUpdateXML.js
rename : toolkit/mozapps/update/test/unit/test_0081_prompt_uiAlreadyOpen.js => toolkit/mozapps/update/tests/unit_aus_update/uiOnlyAllowOneWindow.js
rename : toolkit/mozapps/update/test/unit/test_0080_prompt_silent.js => toolkit/mozapps/update/tests/unit_aus_update/uiSilentPref.js
rename : toolkit/mozapps/update/test/unit/test_0082_prompt_unsupportAlreadyNotified.js => toolkit/mozapps/update/tests/unit_aus_update/uiUnsupportedAlreadyNotified.js
rename : toolkit/mozapps/update/test/unit/test_0050_general.js => toolkit/mozapps/update/tests/unit_aus_update/updateCheckOnLoadOnErrorStatusText.js
rename : toolkit/mozapps/update/test/unit/test_0060_manager.js => toolkit/mozapps/update/tests/unit_aus_update/updateManagerXML.js
rename : toolkit/mozapps/update/test/unit/test_0300_update_root_dir_migration.js => toolkit/mozapps/update/tests/unit_aus_update/updateRootDirMigration_win.js
rename : toolkit/mozapps/update/test/unit/test_0040_general.js => toolkit/mozapps/update/tests/unit_aus_update/urlConstruction.js
rename : toolkit/mozapps/update/test/unit/xpcshell.ini => toolkit/mozapps/update/tests/unit_aus_update/xpcshell.ini
rename : toolkit/mozapps/update/test/unit/test_0203_app_launch_apply_update.js => toolkit/mozapps/update/tests/unit_base_updater/marAppApplyUpdateAppBinInUseStageSuccess_win.js
rename : toolkit/mozapps/update/test/unit/test_0201_app_launch_apply_update.js => toolkit/mozapps/update/tests/unit_base_updater/marAppApplyUpdateStageSuccess.js
rename : toolkit/mozapps/update/test/unit/test_0200_app_launch_apply_update.js => toolkit/mozapps/update/tests/unit_base_updater/marAppApplyUpdateSuccess.js
rename : toolkit/mozapps/update/test/unit/test_0162_appInUse_xp_win_complete.js => toolkit/mozapps/update/tests/unit_base_updater/marAppInUseFallbackStageFailureComplete_win.js
rename : toolkit/mozapps/update/test/unit/test_0161_appInUse_xp_win_complete.js => toolkit/mozapps/update/tests/unit_base_updater/marAppInUseStageFailureComplete_win.js
rename : toolkit/mozapps/update/test/unit/test_0161_appInUse_xp_unix_complete.js => toolkit/mozapps/update/tests/unit_base_updater/marAppInUseStageSuccessComplete_unix.js
rename : toolkit/mozapps/update/test/unit/test_0160_appInUse_complete.js => toolkit/mozapps/update/tests/unit_base_updater/marAppInUseSuccessComplete.js
rename : toolkit/mozapps/update/test/unit/test_0152_appBinReplaced_xp_win_complete.js => toolkit/mozapps/update/tests/unit_base_updater/marCallbackAppStageSuccessComplete_win.js
rename : toolkit/mozapps/update/test/unit/test_0153_appBinPatched_xp_win_partial.js => toolkit/mozapps/update/tests/unit_base_updater/marCallbackAppStageSuccessPartial_win.js
rename : toolkit/mozapps/update/test/unit/test_0150_appBinReplaced_xp_win_complete.js => toolkit/mozapps/update/tests/unit_base_updater/marCallbackAppSuccessComplete_win.js
rename : toolkit/mozapps/update/test/unit/test_0151_appBinPatched_xp_win_partial.js => toolkit/mozapps/update/tests/unit_base_updater/marCallbackAppSuccessPartial_win.js
rename : toolkit/mozapps/update/test/unit/test_0202_app_launch_apply_update_dirlocked.js => toolkit/mozapps/update/tests/unit_base_updater/marDirLockedStageFailure_win.js
rename : toolkit/mozapps/update/test/unit/test_0112_general.js => toolkit/mozapps/update/tests/unit_base_updater/marFailurePartial.js
rename : toolkit/mozapps/update/test/unit/test_0188_fileInUse_xp_win_complete.js => toolkit/mozapps/update/tests/unit_base_updater/marFileInUseFallbackStageFailureComplete_win.js
rename : toolkit/mozapps/update/test/unit/test_0189_fileInUse_xp_win_partial.js => toolkit/mozapps/update/tests/unit_base_updater/marFileInUseFallbackStageFailurePartial_win.js
rename : toolkit/mozapps/update/test/unit/test_0184_fileInUse_xp_win_complete.js => toolkit/mozapps/update/tests/unit_base_updater/marFileInUseStageSuccessComplete_win.js
rename : toolkit/mozapps/update/test/unit/test_0185_fileInUse_xp_win_partial.js => toolkit/mozapps/update/tests/unit_base_updater/marFileInUseStageSuccessPartial_win.js
rename : toolkit/mozapps/update/test/unit/test_0180_fileInUse_xp_win_complete.js => toolkit/mozapps/update/tests/unit_base_updater/marFileInUseSuccessComplete_win.js
rename : toolkit/mozapps/update/test/unit/test_0181_fileInUse_xp_win_partial.js => toolkit/mozapps/update/tests/unit_base_updater/marFileInUseSuccessPartial_win.js
rename : toolkit/mozapps/update/test/unit/test_0170_fileLocked_xp_win_complete.js => toolkit/mozapps/update/tests/unit_base_updater/marFileLockedFailureComplete_win.js
rename : toolkit/mozapps/update/test/unit/test_0171_fileLocked_xp_win_partial.js => toolkit/mozapps/update/tests/unit_base_updater/marFileLockedFailurePartial_win.js
rename : toolkit/mozapps/update/test/unit/test_0174_fileLocked_xp_win_complete.js => toolkit/mozapps/update/tests/unit_base_updater/marFileLockedFallbackStageFailureComplete_win.js
rename : toolkit/mozapps/update/test/unit/test_0175_fileLocked_xp_win_partial.js => toolkit/mozapps/update/tests/unit_base_updater/marFileLockedFallbackStageFailurePartial_win.js
rename : toolkit/mozapps/update/test/unit/test_0172_fileLocked_xp_win_complete.js => toolkit/mozapps/update/tests/unit_base_updater/marFileLockedStageFailureComplete_win.js
rename : toolkit/mozapps/update/test/unit/test_0173_fileLocked_xp_win_partial.js => toolkit/mozapps/update/tests/unit_base_updater/marFileLockedStageFailurePartial_win.js
rename : toolkit/mozapps/update/test/unit/test_0190_rmrfdirFileInUse_xp_win_complete.js => toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseFallbackStageFailureComplete_win.js
rename : toolkit/mozapps/update/test/unit/test_0191_rmrfdirFileInUse_xp_win_partial.js => toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseFallbackStageFailurePartial_win.js
rename : toolkit/mozapps/update/test/unit/test_0186_rmrfdirFileInUse_xp_win_complete.js => toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseStageSuccessComplete_win.js
rename : toolkit/mozapps/update/test/unit/test_0187_rmrfdirFileInUse_xp_win_partial.js => toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseStageSuccessPartial_win.js
rename : toolkit/mozapps/update/test/unit/test_0182_rmrfdirFileInUse_xp_win_complete.js => toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseSuccessComplete_win.js
rename : toolkit/mozapps/update/test/unit/test_0183_rmrfdirFileInUse_xp_win_partial.js => toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseSuccessPartial_win.js
rename : toolkit/mozapps/update/test/unit/test_0115_general.js => toolkit/mozapps/update/tests/unit_base_updater/marStageFailurePartial.js
rename : toolkit/mozapps/update/test/unit/test_0113_general.js => toolkit/mozapps/update/tests/unit_base_updater/marStageSuccessComplete.js
rename : toolkit/mozapps/update/test/unit/test_0114_general.js => toolkit/mozapps/update/tests/unit_base_updater/marStageSuccessPartial.js
rename : toolkit/mozapps/update/test/unit/test_0110_general.js => toolkit/mozapps/update/tests/unit_base_updater/marSuccessComplete.js
rename : toolkit/mozapps/update/test/unit/test_0111_general.js => toolkit/mozapps/update/tests/unit_base_updater/marSuccessPartial.js
rename : toolkit/mozapps/update/test/unit/test_0113_versionDowngradeCheck.js => toolkit/mozapps/update/tests/unit_base_updater/marVersionDowngrade.js
rename : toolkit/mozapps/update/test/unit/test_0114_productChannelCheck.js => toolkit/mozapps/update/tests/unit_base_updater/marWrongChannel.js
rename : toolkit/mozapps/update/test/unit/xpcshell_updater.ini => toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini
rename : toolkit/mozapps/update/test_svc/unit/test_0000_bootstrap_svc.js => toolkit/mozapps/update/tests/unit_service_updater/bootstrapSvc.js
rename : toolkit/mozapps/update/test_svc/unit/test_0203_app_launch_apply_update_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marAppApplyUpdateAppBinInUseStageSuccessSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0201_app_launch_apply_update_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marAppApplyUpdateStageSuccessSvc.js
rename : toolkit/mozapps/update/test_svc/unit/test_0200_app_launch_apply_update_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marAppApplyUpdateSuccessSvc.js
rename : toolkit/mozapps/update/test_svc/unit/test_0162_appInUse_xp_win_complete_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marAppInUseFallbackStageFailureCompleteSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0161_appInUse_xp_win_complete_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marAppInUseStageFailureCompleteSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0160_appInUse_complete_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marAppInUseSuccessCompleteSvc.js
rename : toolkit/mozapps/update/test_svc/unit/test_0152_appBinReplaced_xp_win_complete_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marCallbackAppStageSuccessCompleteSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0153_appBinPatched_xp_win_partial_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marCallbackAppStageSuccessPartialSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0150_appBinReplaced_xp_win_complete_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marCallbackAppSuccessCompleteSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0151_appBinPatched_xp_win_partial_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marCallbackAppSuccessPartialSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0202_app_launch_apply_update_dirlocked_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marDirLockedStageFailureSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0112_general_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marFailurePartialSvc.js
rename : toolkit/mozapps/update/test_svc/unit/test_0188_fileInUse_xp_win_complete_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marFileInUseFallbackStageFailureCompleteSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0189_fileInUse_xp_win_partial_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marFileInUseFallbackStageFailurePartialSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0184_fileInUse_xp_win_complete_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marFileInUseStageSuccessCompleteSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0185_fileInUse_xp_win_partial_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marFileInUseStageSuccessPartialSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0180_fileInUse_xp_win_complete_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marFileInUseSuccessCompleteSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0181_fileInUse_xp_win_partial_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marFileInUseSuccessPartialSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0170_fileLocked_xp_win_complete_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marFileLockedFailureCompleteSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0171_fileLocked_xp_win_partial_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marFileLockedFailurePartialSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0174_fileLocked_xp_win_complete_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marFileLockedFallbackStageFailureCompleteSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0175_fileLocked_xp_win_partial_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marFileLockedFallbackStageFailurePartialSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0172_fileLocked_xp_win_complete_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marFileLockedStageFailureCompleteSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0173_fileLocked_xp_win_partial_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marFileLockedStageFailurePartialSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0190_rmrfdirFileInUse_xp_win_complete_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseFallbackStageFailureCompleteSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0191_rmrfdirFileInUse_xp_win_partial_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseFallbackStageFailurePartialSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0186_rmrfdirFileInUse_xp_win_complete_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseStageSuccessCompleteSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0187_rmrfdirFileInUse_xp_win_partial_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseStageSuccessPartialSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0182_rmrfdirFileInUse_xp_win_complete_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseSuccessCompleteSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0183_rmrfdirFileInUse_xp_win_partial_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseSuccessPartialSvc_win.js
rename : toolkit/mozapps/update/test_svc/unit/test_0115_general_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marStageFailurePartialSvc.js
rename : toolkit/mozapps/update/test_svc/unit/test_0113_general_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marStageSuccessCompleteSvc.js
rename : toolkit/mozapps/update/test_svc/unit/test_0114_general_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marStageSuccessPartialSvc.js
rename : toolkit/mozapps/update/test_svc/unit/test_0110_general_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marSuccessCompleteSvc.js
rename : toolkit/mozapps/update/test_svc/unit/test_0111_general_svc.js => toolkit/mozapps/update/tests/unit_service_updater/marSuccessPartialSvc.js
rename : toolkit/mozapps/update/test_svc/unit/xpcshell.ini => toolkit/mozapps/update/tests/unit_service_updater/xpcshell.ini
rename : toolkit/mozapps/update/test_timermanager/unit/test_0010_timermanager.js => toolkit/mozapps/update/tests/unit_timermanager/consumerNotifications.js
rename : toolkit/mozapps/update/test_timermanager/unit/xpcshell.ini => toolkit/mozapps/update/tests/unit_timermanager/xpcshell.ini
2013-10-25 18:37:29 -07:00
Jared Wein
adf46fac55 Bug 931169 - waitForCondition should guard the condition evaluation. r=dkeeler
--HG--
extra : rebase_source : 13b3ba78cccf9e4f6e25ec305f2def2a59a41c74
2013-10-25 17:48:05 -04:00
Patrick Brosset
20557c91d0 Bug 765105 - Tooltip shared component, showing image previews in markup, css rules and computed views, r=miker,harth 2013-10-26 00:51:01 +05:30
Raymond Lee
afd048951d Bug 885319 - Implement the immersive process check in DownloadIntegration. r=paolo 2013-10-25 19:28:01 +02:00
Ed Morley
e876238298 Merge mozilla-central and fx-team 2013-10-25 17:55:56 +01:00
Ed Morley
e52f4cfac1 Merge latest green fx-team changeset and mozilla-central 2013-10-25 17:28:24 +01:00
Paolo Amadini
767ebee4ce Bug 928349 - Remove obsolete tests currently failing on comm-central. r=jcranmer 2013-10-25 15:55:09 +02:00
Ed Morley
441cb93d95 Merge mozilla-central and inbound 2013-10-25 12:24:13 +01:00
Ed Morley
af0a1da034 Merge mozilla-central and fx-team 2013-10-25 12:19:55 +01:00
Carsten "Tomcat" Book
d7e4c57fbb Merge Fx-Team to Mozilla-Central 2013-10-25 11:21:15 +02:00
Mike Hommey
b000a846c2 Bug 929905 - Consolidate sources in moz.build. r=gps 2013-10-25 08:23:05 +09:00
Mike Hommey
65c4700367 Bug 930380 - Make sure *SOURCES only point to existing files. r=gps 2013-10-25 07:58:17 +09:00
Steven MacLeod
1f3a7b8500 Bug 887868 - Remove search.sqlite migration code. r=gavin 2013-11-05 14:23:58 -05:00
Brian R. Bondy
73b11d1135 Bug 924894 - Split prefs files up for Metro and Desktop when running in the same profile. r=jimm 2013-11-05 13:20:39 -05:00
Nils Maier
014077a85c Bug 924916: Part 4 - xpcshell tests for OS.File.setDates(). r=yoric 2013-10-28 05:42:00 +00:00
Nils Maier
c300b06a8d Bug 924916: Part 3 - Provide async OS.File.setDates() API for main-thread. r=yoric 2013-10-28 05:41:00 +00:00
Nils Maier
44cb229436 Bug 924916: Part 2 - Implement OS.File.setDates() for Windows. r=yoric 2013-10-28 05:40:00 +00:00
Nils Maier
500ac6e588 Bug 924916: Part 1 - Implement OS.File.setDates() for Unix. r=yoric 2013-10-28 05:40:00 +00:00
Nils Maier
a6699d7288 Bug 929297 - Part 1: AddonManager should refuse to run in child processes. r=Unfocused 2013-10-28 04:52:00 +00:00
Aaron Klotz
3d83aa7a6f Bug 827416: Adds profileHDDModel and profileHDDRevision to nsSystemInfo; r=bbondy
--HG--
extra : rebase_source : b0d012c1f2767b0002e3daa87294eb675cf8e29b
2013-11-01 16:54:25 -06:00
Monica Chew
fbd7f92937 Bug 887044: Remove CsdTesting/Mozilla from User-Agent, set safebrowsing URLs to use the GOOGLE_API_KEY (r=dougt) 2013-11-01 15:43:28 -07:00
Birunthan Mohanathas
02a1314689 Bug 784739 - Switch from NULL to nullptr in miscellaneous directories; r=ehsan 2013-11-11 14:17:14 -05:00
Monica Chew
7fcf2892da Bug 895476: Remove extra dump call (r=paolo) 2013-11-11 11:07:03 -08:00
Monica Chew
f2bf1990f6 Bug 895476: Integrate application reputation with download manager, disable remote lookups for application reputation (r=paolo) 2013-11-11 10:54:09 -08:00
Monica Chew
705586a6a6 Bug 895476: Enable updating local lists for application reputation (r=gcp) 2013-10-31 14:15:14 -07:00
David Rajchenbach-Teller
c09bac729b Bug 860493 - Add telemetry for history swipe animations. r=spohl,felipe 2013-11-11 13:20:35 -05:00
Ryan VanderMeulen
1e03d34ba6 Merge m-c to fx-team. 2013-11-07 14:49:21 -05:00
Carsten "Tomcat" Book
03cad4df42 merge mozilla-central to fx-team 2013-11-07 16:04:23 +01:00
Jonathan Fuentes
35cd5a8e6f Bug 895603 - Remove named function expressions from script actors. r=fitzgen 2013-11-07 09:27:40 -05:00
Raymond Lee
7846d37db1 Bug 725943 - Refactor nsSearchService to generalize use of Lazy. r=MattN 2013-11-07 05:48:12 +08:00
Nick Fitzgerald
9379e40d2e Bug 917583 - part 1: make function's definition site its own request in the RDP; r=past 2013-11-05 16:40:00 -08:00
Victor Porof
4d62515ddc Bug 910953 - Avoid strict warnings in webgl.js, r=me 2013-10-25 11:43:25 +03:00
Victor Porof
b2a7636fab Bug 910955 - Implement a live WebGL shader editor, r=dcamp 2013-10-25 10:18:41 +03:00
Nicholas Nethercote
8aa18001f7 Bug 929797 - Implement proper memory reporting for child processes. r=khuey.
--HG--
extra : rebase_source : f0788757afc2097830295170120e1e2094993cc7
2013-10-22 22:26:24 -07:00
Nicholas Nethercote
8c8a472c81 Bug 933502 - Make memory reporter mochitests work with ASAN. r=gps,me.
--HG--
extra : rebase_source : 325ee35d47aa38d1cc28008f449fce5fb3a658fc
2013-10-31 19:19:10 -07:00
Brian Grinstead
a85776a1a7 Bug 895561 - 'Edit As HTML' option in the markup view - toolkit changes, r=fitzgen 2013-10-23 11:53:39 -05:00
Ed Morley
2bbc535aa4 Backed out changeset 9eaf00ec189a (bug 906839) on suspicion of increasing the failure rate of browser_frameworker.js 2013-10-24 18:51:16 +01:00
Dave Townsend
a76e2ce55f Bug 562674: Make XPI extraction asynchronous. r=Unfocused 2013-10-24 09:23:32 -07:00
Shane Caraveo
b959582a18 Bug 906839 - enable by default social.allowMultipleWorkers - update tests to work pref'd on and fix a missing update to the worker state, r=markh. 2013-10-24 15:53:36 +02:00
Gijs Kruitbosch
135fa02db3 Bug 920794 - make browser console DWIM, r=msucan 2013-10-22 16:37:23 +02:00
Nicholas Nethercote
498ce38434 Bug 929826 - Improve about:memory's UI for the multi-process case. r=johns.
--HG--
extra : rebase_source : c248a0127c7d160fc0016dabca1f3561233a577c
2013-10-22 22:27:58 -07:00
Alexandre Poirot
d2153eb042 Bug 920481 - Ensure flushing jar cache when updating an app. r=paul 2013-10-22 03:25:50 +02:00
Alexandre Poirot
df2268089f Bug 920481 - Call BrowserTabActor.reload when the app is updated to refresh the app. r=paul 2013-10-22 03:25:46 +02:00
Alexandre Poirot
32b4260002 Bug 918695 - Ensure dispatching tabDetached event for ContentAppActor when the app is closed/killed r=paul 2013-10-21 10:38:00 +01:00
Alexandre Poirot
6bbdd793c5 Bug 918695 - Only instanciate one singleton target per app r=paul 2013-10-21 10:35:00 +01:00
Jared Wein
ad50f49e9d Bug 930071 - Remove site identity panel telemetry probe. r=felipe 2013-10-23 12:08:00 +01:00
J. Ryan Stinnett
8eb5b9f012 Bug 929824 - Pretty print RDP on receive. r=robcee 2013-10-22 20:41:57 -05:00
Raymond Lee
63db6db60b Bug 926736 - Returns path string for get directory methods in DownloadIntegration.jsm r=paolo 2013-10-23 10:04:55 +08:00
Raymond Lee
878b214551 Bug 926736 - Update mozapps callers for new return type of get directory methods in DownloadIntegration.jsm r=paolo 2013-10-21 13:04:59 +08:00
Felipe Gomes
686d6d954d Bug 906134 - Implement xpcshell tests for the DownloadImport module. r=paolo 2013-10-24 13:25:05 +02:00
Paul Rouget
0aeb12701d Bug 926371 - show reflow events in the webconsole. r=msucan 2013-10-22 08:43:00 +01:00
J. Ryan Stinnett
adbbbe5d87 Bug 929159 - Add output-parser to SrcdirProvider and test mapping. r=jwalker 2013-10-21 16:17:12 -05:00
Panos Astithas
a40e79c207 Make the debugger more resilient in the presence of a bogus source map (bug 906889). r=fitzgen 2013-10-24 11:47:10 +03:00
Carsten "Tomcat" Book
f9f859a242 Merge mozilla-central to fx-team 2013-10-24 07:10:24 +02:00
Carsten "Tomcat" Book
0e4e01758c Merge mozilla-inbound to Mozilla-Central 2013-10-24 07:05:29 +02:00
Mark Hammond
dfe9a5d7fb Bug 910566 - handle remote frameworker process crashes. r=felipe 2013-10-24 15:22:16 +11:00
Mike Hommey
59a17d0f20 Bug 921492 - Make StrictOrderingOnAppendList use actual alphabetical sorting. r=mshal,r=gps 2013-10-24 08:05:43 +09:00
Mike Hommey
3fa7456cd6 Bug 913268 - Make CPP_SOURCES a StrictOrderingOnAppendList. r=mshal 2013-10-24 08:00:23 +09:00
Paolo Amadini
cd2ba67f77 Bug 928349 - Add a build-time setting to use only the JavaScript API for downloads, and enable it in Firefox for Desktop. r=enn 2013-10-23 21:46:47 +02:00
Ed Morley
f7d2621ce9 Backed out changeset 54da01870611 (bug 920481) for test_webapps_actor.html timeouts on a CLOSED TREE 2013-10-23 16:15:02 +01:00
Ed Morley
1df19015c8 Backed out changeset 1864e27d5ee4 (bug 920481) 2013-10-23 16:14:35 +01:00
Alexandre Poirot
3d0405de63 Bug 920481 - Call BrowserTabActor.reload when the app is updated to refresh the app. r=paul 2013-10-19 21:14:47 +02:00
Alexandre Poirot
d8bf7beb44 Bug 920481 - Ensure flushing jar cache when updating an app. r=paul 2013-10-19 21:14:44 +02:00
Alexandre Poirot
82b18180a5 Bug 927108 - Fix certified app actor installation r=paul 2013-10-19 21:03:30 +02:00
Carsten "Tomcat" Book
1dbdf340d6 Merge mozilla-central to fx-team 2013-10-23 15:03:32 +02:00
Carsten "Tomcat" Book
9891a8088d Merge b2g-inbound to Mozilla-Central 2013-10-23 14:51:43 +02:00
Shawn Huang
4471a0f8e1 Bug 880610: Part1-Add build flag to support both bluez/bluedroid stacks, r=glandium 2013-10-23 14:12:24 +08:00
Wes Kocher
3d55f8e6de Merge m-c to inbound 2013-10-22 18:43:11 -04:00
Wes Kocher
16d6e76b4e Merge inbound to m-c 2013-10-22 18:11:06 -04:00