Commit Graph

16342 Commits

Author SHA1 Message Date
Robert Bindar
b69bae63ce Bug 903404 - Move toolkit/content/aboutNetworking.net to toolkit/themes/shared. r=gavin
--HG--
rename : toolkit/content/aboutNetworking.css => toolkit/themes/shared/aboutNetworking.css
2013-08-16 15:17:53 -04:00
Marco Castelluccio
9e3f81583e Bug 892837 - Add manifestURL to the webapp.json file. r=myk 2013-08-16 15:17:53 -04:00
Felipe Gomes
bb78152be2 Bug 851466 - Import downloads.sqlite to downloads.json. r=paolo 2013-08-16 15:35:42 -03:00
Yury Delendik
ee9001635f Bug 894546 - Histograms for pdf.js. r=froydnj 2013-08-13 17:13:19 -05:00
Mike Hordecki
26023dc8a5 Bug 755412 - Debugging protocol server should drop connection if packet framing is bad. r=past, r=jimb 2013-08-16 08:48:22 -04:00
Paolo Amadini
787dfa9563 Bug 895403 - Disable methods of nsIDownloadManager that are replaced by the JavaScript API. r=enn 2013-08-16 11:02:24 +02:00
Paolo Amadini
72eecfabb9 Bug 836443 - Automatically stop and restart downloads. r=enn 2013-08-16 11:02:18 +02:00
Paolo Amadini
49149df9c3 Bug 899124 - Compute download speed and throttle notifications. r=enn 2013-08-16 11:02:15 +02:00
David Rajchenbach-Teller
a867d4ee01 Bug 872577 - Using default resolution for free() instead of libc. r=froydnj
--HG--
extra : rebase_source : d31bbc9108fb9ca81b0d6d18f97d4afab2e380de
2013-08-14 22:12:47 +02:00
Mike Hommey
809d6cadcb Bug 904364 - Don't build an empty (fake) library in toolkit/components/osfile. r=mshal 2013-08-15 23:45:06 +09:00
Ed Morley
0d8fe75fcb Merge mozilla-central and inbound 2013-08-15 13:37:16 +01:00
Ed Morley
ac93237f7c Merge latest green b2g-inbound changeset and mozilla-central 2013-08-15 11:58:48 +01:00
Chris Manchester
f757b248e5 Bug 905239 - Fix undefined guard missed in review for bug 890555. r=jimb 2013-08-14 09:58:41 -07:00
Gregory Szorc
c089ae373d Bug 850380 - Derecursify and optimize XPIDL processing and move into precompile tier; r=glandium 2013-08-14 08:40:25 -07:00
Bill McCloskey
a293b393e4 Bug 902208 - Handle SIGINT in child processes (r=ted) 2013-08-14 14:48:32 -07:00
Ryan VanderMeulen
8b8be2a46a Merge m-c to inbound. 2013-08-14 17:11:30 -04:00
Nick Fitzgerald
751474b94d Bug 840684 - Source map the location of frames in the RDP; r=vporof 2013-08-14 09:50:28 -07:00
Ms2ger
a04009b5b7 Merge latest PGO-green inbounc changeset to m-c. 2013-08-14 14:45:47 +02:00
Ms2ger
93933b0de8 Bug 897909 - Cleanup some SIMPLE_PROGRAMS; r=gps
* * *
FOLD
2013-08-14 09:00:13 +02:00
Ms2ger
df8525f77d Bug 901323 - Don't include nsContentUtils.h unnecessarily; r=jlebar 2013-08-14 08:56:21 +02:00
Nick Fitzgerald
9ed6511ec9 Bug 904196 - sctrict error in onDisplayString; r=vporof 2013-08-13 16:57:05 -07:00
Nick Fitzgerald
3adae98af2 Bug 903801 - testcompatactors.js triggers an error by adding a debuggee to a thread actor in a detached state; r=past 2013-08-13 16:53:49 -07:00
Ryan VanderMeulen
f339aa3dc1 Merge m-c to fx-team. 2013-08-13 16:55:00 -04:00
Ryan VanderMeulen
2cf7945b69 Merge m-c to fx-team. 2013-08-13 15:39:41 -04:00
Ryan VanderMeulen
25348fabd9 Merge m-c to b2g-inbound. 2013-08-13 15:38:58 -04:00
Sotaro Ikeda
3a446332af Bug 903174 - Move GonkNativeWindow to /widget/gonk/nativewindow. r=vlad 2013-08-13 12:58:38 -04:00
Ryan VanderMeulen
d9df649155 Backed out changeset 9baba7e5b351 (bug 872577) for multiple Android failures.
CLOSED TREE
2013-08-13 12:51:17 -04:00
Axel Hecht
049f495018 bug 848830, fix regression in app updater localization, r=glandium, rstrong
--HG--
extra : rebase_source : 66b4e3e55a05d4b74bd39a40c4768c620b74062a
2013-08-13 17:15:42 +02:00
Ryan VanderMeulen
5ba0b25a8d Merge m-c to inbound. 2013-08-13 16:56:11 -04:00
David Rajchenbach-Teller
8ca84329bd Bug 872577 - Using default resolution for free() instead of libc. r=nfroyd
--HG--
extra : rebase_source : 70884bd2b27ebf7c9ec2273e495808a655283c49
2013-08-13 16:04:40 +02:00
Carsten "Tomcat" Book
73e9d4dcd8 merge mozilla-central to mozilla-inbound 2013-08-13 13:52:35 +02:00
Ms2ger
f9ca076cae Backout changeset 9a57f0f347e3 for insufficient review. 2013-08-13 13:30:00 +02:00
Carsten "Tomcat" Book
5b7a6d6f6c merge mozilla-inbound to mozilla-central 2013-08-13 12:34:27 +02:00
Ryan VanderMeulen
e2d867ead3 Merge m-c to fx-team. 2013-08-12 22:00:03 -04:00
Marco Castelluccio
aa4e9ba2ca Bug 903533 - Fix webapps directory creation on Linux. r=felipe 2013-08-12 20:53:24 -03:00
Ryan VanderMeulen
f228f7b518 Merge fx-team to m-c. 2013-08-12 17:42:19 -04:00
Bobby Holley
81026a6fdf Bug 901364 - Remove a bunch of now-unused modal state tracking machinery. r=mrbkap 2013-08-12 12:54:51 -07:00
Ryan VanderMeulen
1f195915a2 Merge m-c to fx-team. 2013-08-12 15:37:10 -04:00
Tim Taubert
f5d4545aa0 Bug 903293 - Remote browser constructors shouldn't try to initialize session history; r=felipe 2013-08-12 20:16:11 +02:00
Brandon Benvie
7b0b48adf9 Bug 897256 - Add Debugger Protocol support for NaN, Infinity, and -Infinity. r=dcamp 2013-08-12 10:15:22 -07:00
Chris Pearce
74b090b494 Bug 861693 - Makefile and moz.build changes required for DirectShow audio backend. r=gps 2013-08-13 16:49:25 +12:00
David Rajchenbach-Teller
43013501d5 Bug 874435 - Fix lastAccessDate/lastModificationDate typo. r=froydnj 2013-08-12 08:40:42 -04:00
Po-Chun Chang
7b6c89bf5b Bug 898238 - Avoid wasted work in nsUrlClassifierDBServiceWorker::CacheCompletions(). r=dcamp 2013-08-12 08:40:19 -04:00
Tim Taubert
747402c095 Bug 904039 - Take devicePixelRatio into account when determining thumbnail size; r=markh 2013-08-12 14:39:56 +02:00
Carsten "Tomcat" Book
df266eb1de merge mozilla-central to fx-team 2013-08-12 11:41:37 +02:00
Carsten "Tomcat" Book
2d5bef5a11 merge mozilla-inbound to mozilla-central 2013-08-12 11:28:29 +02:00
Justin Dolske
37483c5802 Bug 902202 - Fix a "can't access dead object" error that new log parser just noticed. r=mattn 2013-08-11 01:33:30 -07:00
Ryan VanderMeulen
dd7fc67a3f Bug 827805 - Fix xpcshell manifest so that the new test runs and test_logging.js remains disabled. 2013-08-13 14:47:37 -04:00
Ed Morley
553e29c238 Bug 901898 - Remove codesighs now that it's no longer run in automation; r=gps 2013-08-12 13:10:41 +01:00
Irving Reid
332c603f26 Bug 853388: Keep trying to save JSON even if read or save fails; r=unfocused 2013-08-09 20:21:47 -04:00
Irving Reid
35516037a0 Bug 853388: Load JSON database asynchronously outside of startup; r=unfocused 2013-08-08 16:05:33 -04:00
Irving Reid
18f29be579 Bug 853388: Trigger XPI database conversion from SQLITE based on schema version preference; r=unfocused 2013-08-08 15:56:39 -04:00
Irving Reid
bb04dc0106 Bug 853388: Remove transaction model of database flush control and implement async save of database; r=unfocused 2013-08-08 15:56:35 -04:00
Irving Reid
8dc12a6caf Bug 853388: Upgrade existing SQLITE databases to JSON; r=unfocused 2013-08-08 15:56:26 -04:00
Irving Reid
9cfac5cf1e Back out 74673d1b1718 for missing reviewer 2013-08-10 19:38:14 -04:00
Irving Reid
985a1f45f7 Back out 2015a41cdf70 for missing reviewer 2013-08-10 19:37:00 -04:00
Irving Reid
262e61a2c4 Back out 816af0c07c46 for missing reviewer 2013-08-10 19:34:46 -04:00
Irving Reid
f0e9ed1e61 Back out 629a3e8bd2b1 for missing reviewer 2013-08-10 19:32:34 -04:00
Irving Reid
f8373ef7f3 Back out 20d83a7220ca for missing reviewer 2013-08-10 19:27:33 -04:00
Irving Reid
3523641f7f Bug 853388: Keep trying to save JSON even if read or save fails 2013-08-09 20:21:47 -04:00
Irving Reid
8ad9d64ede Bug 853388: Load JSON database asynchronously outside of startup 2013-08-08 16:05:33 -04:00
Irving Reid
5170a04a18 Bug 853388: Trigger XPI database conversion from SQLITE based on schema version preference 2013-08-08 15:56:39 -04:00
Irving Reid
ee62d7a348 Bug 853388: Remove transaction model of database flush control and implement async save of database 2013-08-08 15:56:35 -04:00
Irving Reid
ba6004ddd2 Bug 853388: Upgrade existing SQLITE databases to JSON 2013-08-08 15:56:26 -04:00
Irving Reid
4c74c23299 Bug 853388: Save and load XPIProvider state to/from a JSON file; r=unfocused 2013-08-08 15:56:22 -04:00
Ehsan Akhgari
7ed6731ca6 Bug 904001 - Blocklist the old Relevant Knowledge DLLs; r=vlad 2013-08-13 13:27:21 -04:00
Ryan VanderMeulen
f78dae4294 Merge m-c to b2g-inbound. 2013-08-14 17:12:43 -04:00
Marco Castelluccio
9ed77c3477 Bug 904938 - Fix installLocation problem. r=tabraldes 2013-08-14 16:20:39 -04:00
Neil Rashbrook
a945ebb57d Bug 896768 Test for autocompletesearch="file" results r=Mossop
--HG--
extra : rebase_source : e213d82c9703b1ddf5145768c2ef894260bfc155
2013-08-12 23:53:56 +01:00
Neil Rashbrook
54bcb094a8 Bug 896768 Allow autocompletesearch="file" results to be styled r=Mossop
--HG--
extra : rebase_source : 1e710d9308c037c9037fe00e9360eb1ee0131408
2013-08-12 23:52:44 +01:00
Ryan VanderMeulen
ae8458b977 Merge m-c to inbound. 2013-08-12 17:43:24 -04:00
Guillaume Destuynder
65326fc6cb Bug 790923: Adds seccomp-bfp sandboxing support for B2G. r=agal, r=dhylands, r=dkeeler, r=imelven, a=kang. 2013-08-12 12:58:35 -07:00
Dave Camp
47c67b5b7b Bug 903453 - Make some CssLogic members explicitly public that we use elsewhere. r=jwalker
--HG--
extra : rebase_source : b05dce10120d7f7334389c8af32705351020618d
2013-08-07 09:47:45 -07:00
Dave Camp
aeaccb3e21 Bug 903454 - Rename CssLogic.FILTER.ALL to CssLogic.FILTER.USER. r=jwalker
--HG--
extra : rebase_source : 7115356a488daa890b9c4dde0f57a9df5d5f27c6
2013-08-07 09:27:22 -07:00
Anup Allamsetty
e8e22c88c7 Bug 903511 - Rename "GripClient" to "ObjectClient". r=fitzgen 2013-08-13 12:08:30 -04:00
David Rajchenbach-Teller
7ebcb4c5fb Bug 874425 - Add more logging to attempt to find out source of negative durations under Windows. r=yoric 2013-08-23 10:06:33 -04:00
Richard Marti
f0b5dbbcc5 Bug 898955 - zotero Library navigation pane draws unusual borders. r=dao 2013-08-23 11:06:48 +02:00
Trevor Saunders
adb11a49b2 fixup backout of bug 902316 on a CLOSED TREE 2013-08-09 23:01:31 -04:00
Trevor Saunders
67fceaf3a1 partially backout bug 902316 because there is dependancies between the libraries we build in media/omx-plugin/ CLOSED TREE 2013-08-09 22:32:41 -04:00
Ryan VanderMeulen
9ea081d7b8 Merge m-c to fx-team. 2013-08-09 19:32:24 -04:00
Ryan VanderMeulen
7a54b5e31f Merge fx-team to m-c. 2013-08-09 19:28:34 -04:00
Ryan VanderMeulen
8afe7e8fed Merge inbound to m-c. 2013-08-09 19:08:45 -04:00
Justin Dolske
5154ccb7a3 Bug 901409 - Update password manager tests to prepare for bug 355063. r=mattn 2013-08-09 14:56:50 -07:00
Ryan VanderMeulen
4f61ff1332 Merge m-c to fx-team. 2013-08-09 17:29:37 -04:00
Ryan VanderMeulen
1c27efb8bd Merge b2g-inbound to m-c. 2013-08-09 17:26:14 -04:00
David Rajchenbach-Teller
a3b85e2bb6 Bug 902434 - Move Telemetry I/O to TelemetryFile.jsm. r=froydnj 2013-08-09 14:11:09 -04:00
Sunny
540e91ea64 Bug 827805 - [OS.File] Use Deprecated.jsm to mark deprecation of OS.File.Info.prototype.creationDate. r=yoric 2013-08-09 14:10:44 -04:00
Max Li
e6d09bd7b9 Bug 900097 - statusbarpanel shouldn't be a button accessible. r=enn 2013-08-08 18:39:56 -04:00
Ryan VanderMeulen
4bdd6d2653 Merge m-c to b2g-inbound. 2013-08-08 16:24:53 -04:00
Tim Taubert
4ae2005c12 Backed out changeset b3afaf3b4f3a (bug 853388) 2013-08-09 04:20:08 +02:00
Tim Taubert
b98d1e6659 Backed out changeset 5861a7f63f25 (bug 853388) 2013-08-09 04:20:07 +02:00
Tim Taubert
e9a95b56e0 Backed out changeset ee904d911f2d (bug 853388) 2013-08-09 04:20:06 +02:00
Tim Taubert
0a2961b1ae Backed out changeset f3cf78d7e62d (bug 853388) 2013-08-09 04:20:05 +02:00
Tim Taubert
1664071cfe Backed out changeset 40c48d65e382 (bug 853388) 2013-08-09 04:20:03 +02:00
Tim Taubert
40469d2011 Backed out changeset 607b35c777f0 (bug 853388) 2013-08-09 04:20:02 +02:00
Mark Hammond
ac7c070103 Bug 897811 - fix uses of browser.pagethumbnails.capturing_disabled to reflect the pref controls if it is *disabled* rather than enabled. r=gavin 2013-08-08 09:52:01 +10:00
Tom Schuster
991ead8d61 Bug 884410 - Remove JS_ValueToECMAInt32 and replace it with JS::ToInt32. r=terrence 2013-08-15 17:41:51 -04:00
Justin Dolske
efbed0a693 Bug 355063 - Password manager does not work on script-generated forms, should use new DOMFormHasPassword event instead. r=mattn 2013-08-21 17:25:03 -07:00
Dave Camp
b36c61838d Bug 886037 - Add a styles actor for the style inspectors. r=jwalker
--HG--
extra : rebase_source : 80aa9dc491c77f4b73036daeddd48f51c40f015a
2013-07-23 15:51:58 -07:00
Tom Schuster
19b8c26cae Bug 896748 - Electrolysis: Html 5 notification permission request box doesn't open. r=felipe 2013-07-22 20:24:11 -04:00
Ryan VanderMeulen
d99f5cd37a Merge m-c to inbound. 2013-08-22 15:44:40 -04:00
Eddy Bruel
3a6cb883d7 Bug 899052 - Promisify the debugger's live list interface; r=fitzgen 2013-08-21 02:08:48 +02:00
Ryan VanderMeulen
64b2bc7dd9 Backed out changesets 1fa1f28c6edf and e74f694f31c4 (bug 850380) for PGO bustage on a CLOSED TREE. 2013-08-14 15:12:20 -04:00
Irving Reid
5f378b6851 Bug 853388: Keep trying to save JSON even if read or save fails; r=unfocused 2013-08-08 16:08:42 -04:00
Irving Reid
e686675bcc Bug 853388: Load JSON database asynchronously outside of startup; r=unfocused 2013-08-08 16:05:33 -04:00
Irving Reid
b3f4982863 Bug 853388: Trigger XPI database conversion from SQLITE based on schema version preference; r=unfocused 2013-08-08 15:56:39 -04:00
Irving Reid
4c09cee28a Bug 853388: Remove transaction model of database flush control and implement async save of database; r=unfocused 2013-08-08 15:56:35 -04:00
Irving Reid
38feab6f09 Bug 853388: Upgrade existing SQLITE databases to JSON; r=unfocused 2013-08-08 15:56:26 -04:00
Irving Reid
0033499ba4 Bug 853388: Save and load XPIProvider state to/from a JSON file; r=unfocused 2013-08-08 15:56:22 -04:00
Ryan VanderMeulen
d28d6462b2 Merge m-c to fx-team. 2013-08-08 16:25:37 -04:00
Carsten "Tomcat" Book
f524a73c0d merge mozilla-central to fx-team 2013-08-08 14:05:38 +02:00
Carsten "Tomcat" Book
637a43421b merge mozilla-inbound to mozilla-central 2013-08-08 13:13:05 +02:00
Tim Taubert
5a866dae32 Backed out changeset ef8248e892e0 (bug 891110) 2013-08-08 05:24:03 +02:00
Karim Hamidou
5d289c086b Bug 891110 - Detect attempts to pass undefined in declareFFI. r=yoric 2013-08-07 20:19:45 -04:00
Michael Brennan
7f208b37e3 Bug 818225 - Add getThumbnail method to PageThumbs. r=yoric 2013-08-07 22:48:07 +02:00
Valentin Gosu
b91228f550 Bug 865850 - Integrate about:networking into Firefox. r=ttaubert 2013-08-07 20:15:28 -04:00
Steffen Wilberg
8ed68047a0 Bug 711475: Allow to perform updates using the About Firefox dialog on limited user accounts if the maintenance service is installed. r=bbondy 2013-08-07 23:07:17 +02:00
Ryan VanderMeulen
a58d328a77 Merge m-c to fx-team. 2013-08-07 14:46:19 -04:00
Dave Camp
92aa250799 Bug 896811 - Test output looks very strange, and is useless for failing tests. r=jwalker
--HG--
extra : rebase_source : 5be7e5d80dcda096adacc58f9348c5f999cf52d3
2013-08-07 11:01:49 -07:00
Paolo Amadini
c4f9af8a50 Bug 901563 - DownloadLegacySaver should move the ".part" file to the target. r=enn 2013-08-07 13:09:04 +02:00
Robert O'Callahan
0c0594a7e4 Bug 898940. Test. r=jaws
--HG--
extra : rebase_source : f046ff1f706875c2188ce3593c45d637ddf5a144
2013-08-07 15:31:25 +12:00
David Rajchenbach-Teller
2930f3c727 Bug 900946 - moduleStack now plays smarter with urls. r=gozala 2013-08-06 17:57:08 -04:00
Alexandre Poirot
def8e52aa1 Bug 900500 - Add pref to bypass devtool's prompt on remote connection. r=robcee, r=mgoodwin 2013-08-06 17:56:45 -04:00
Ryan VanderMeulen
7b3ea5bbc9 Merge m-c to fx-team. 2013-08-06 14:23:55 -04:00
David Zbarsky
de328bd8e8 Bug 902732: Merge nsILink and dom::Link r=bz 2013-08-08 01:26:32 -04:00
Boris Zbarsky
27c0e89dfb Back out revision ab9642207875 (bug 897811) for browser-chrome test failures. 2013-08-08 01:13:45 -04:00
Mark Hammond
00e585ad0e Bug 897811 - fix uses of browser.pagethumbnails.capturing_disabled to reflect the pref controls if it is *disabled* rather than enabled. r=gavin 2013-08-08 09:52:01 +10:00
Ed Morley
8ed777a5a6 Merge mozilla-central and inbound 2013-08-07 16:19:03 -07:00
Jonathan Griffin
f02c3b7cd6 Bug 898074 - Backout c92dc0497dfb, a=test-only 2013-08-07 14:54:31 -07:00
Robert O'Callahan
e83a52e905 Bug 898940. Show the controls bar for all non-dynamic controls. r=dolske
--HG--
extra : rebase_source : 86ba0e6b676760fbd35b2d67d8612ee4280716ba
2013-08-01 16:04:16 +12:00
Dave Camp
d35f324ce4 Bug 897275 - Move css-logic.js to toolkit. r=jwalker
--HG--
rename : browser/devtools/styleinspector/css-logic.js => toolkit/devtools/styleinspector/css-logic.js
extra : rebase_source : 6d7cbdea4ec7bfed78083ec62c125b6d6c0bab4f
2013-07-24 10:57:04 -07:00
Ivan Alagenchev
2cef9e7f7c Bug 762593 TOOLKIT patch. Adds logic for validating if password input fields are insecure. r=dolske 2013-08-06 10:14:40 -04:00
Geoff Lankow
c10ca55a69 Bug 901341 - Multi-option inline settings not initialized properly; r=Unfocused 2013-08-06 23:50:31 +12:00
Ryan VanderMeulen
b037837c6c Merge m-c to fx-team. 2013-08-05 23:22:11 -04:00
Ryan VanderMeulen
8e33abb5a7 Merge m-c to inbound. 2013-08-05 20:00:43 -04:00
Justin Lebar
1c7deef637 Bug 893222 - Part 4: Tests. r=njn 2013-08-05 16:33:00 -07:00
Ryan VanderMeulen
552b158a0b Backed out changesets fbba341b5faf, 4b2c9adef1e4, and bde98e3a7194 (bug 762593) for mochitest-bc failures. 2013-08-05 16:58:37 -04:00
Marco Castelluccio
1f75817593 Bug 786407 - "UninstallString" for natively installed web apps should be quoted properly. r=felipc 2013-08-05 16:27:05 -04:00
Carsten "Tomcat" Book
cda28b85ed Merge b2g-inbound to m-c 2013-08-05 11:22:48 +02:00
Carsten "Tomcat" Book
84e8c858bb Merge m-i to m-c 2013-08-05 11:18:59 +02:00
Ivan Alagenchev
4a08d36568 Bug 762593 TOOLKIT patch. Adds logic for validating if password input fields are insecure. r=dolske 2013-08-05 11:22:59 -07:00
Ryan VanderMeulen
310004f101 Merge m-c to b2g-inbound. 2013-08-02 19:55:10 -04:00
Dave Hylands
64a44bcb08 Bug 898074 - Defer close to ensure that it doesn't happen before onPacket processing. r=dcamp 2013-08-02 16:50:02 -07:00
Ryan VanderMeulen
466d68f6c5 Merge m-c to fx-team. 2013-08-02 17:09:31 -04:00
Ryan VanderMeulen
e44fa2bc7c Merge inbound to m-c. 2013-08-02 16:36:40 -04:00
Ryan VanderMeulen
24743de8ad Backed out 7 changesets (bug 893222, bug 899256) for build bustage on a CLOSED TREE.
Backed out changeset 4aa234138f44 (bug 893222)
Backed out changeset 4b0bf28abdf2 (bug 899256)
Backed out changeset ea8b6ba99c05 (bug 893222)
Backed out changeset ac8220cb61d5 (bug 893222)
Backed out changeset d01358ff4b15 (bug 893222)
Backed out changeset 3baebe7cc655 (bug 893222)
Backed out changeset 4bdf8611ec57 (bug 893222)
2013-08-02 14:49:38 -04:00
Wes Johnston
0588403e08 Bug 896350 - Don't close notifications unless explicitly requested to. r=blassey 2013-08-02 11:04:49 -07:00
Ed Morley
d0a6230a88 Merge mozilla-central and b2g-inbound 2013-08-02 13:51:22 +01:00
Robert O'Callahan
2e1a05e0f3 Bug 898946. Avoid #including XPCOM headers within maintenanceservice. r=bbondy
--HG--
extra : rebase_source : b19663967f7af21daf8f3cf123701a79e295f4b3
2013-08-02 21:30:06 +12:00
Ms2ger
5c2b63d2c7 Merge m-c to inbound. 2013-08-02 11:07:57 +02:00