wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity
143,875 Commits 1 Branch 166 Tags 1.2 GiB
56fc803e4e
Commit Graph

16341 Commits

Author SHA1 Message Date
Marco Castelluccio
addfaba592 Bug 892837 - Add manifestURL to the webapp.json file. r=myk 2013-08-16 15:17:53 -04:00
Felipe Gomes
3c95324d1d Bug 851466 - Import downloads.sqlite to downloads.json. r=paolo 2013-08-16 15:35:42 -03:00
Yury Delendik
2b02612dc9 Bug 894546 - Histograms for pdf.js. r=froydnj 2013-08-13 17:13:19 -05:00
Mike Hordecki
20120b9159 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
eb0085448e 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
2fbbc58b56 Bug 836443 - Automatically stop and restart downloads. r=enn 2013-08-16 11:02:18 +02:00
Paolo Amadini
d8228508ed Bug 899124 - Compute download speed and throttle notifications. r=enn 2013-08-16 11:02:15 +02:00
David Rajchenbach-Teller
5f959c99ed 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
e980c1f9f0 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
51fdb84b2b Merge mozilla-central and inbound 2013-08-15 13:37:16 +01:00
Ed Morley
342ecd9690 Merge latest green b2g-inbound changeset and mozilla-central 2013-08-15 11:58:48 +01:00
Chris Manchester
814f51756e Bug 905239 - Fix undefined guard missed in review for bug 890555. r=jimb 2013-08-14 09:58:41 -07:00
Gregory Szorc
918eef7c37 Bug 850380 - Derecursify and optimize XPIDL processing and move into precompile tier; r=glandium 2013-08-14 08:40:25 -07:00
Bill McCloskey
676069b2bc Bug 902208 - Handle SIGINT in child processes (r=ted) 2013-08-14 14:48:32 -07:00
Ryan VanderMeulen
c292f445e7 Merge m-c to inbound. 2013-08-14 17:11:30 -04:00
Nick Fitzgerald
ea11a569a6 Bug 840684 - Source map the location of frames in the RDP; r=vporof 2013-08-14 09:50:28 -07:00
Ms2ger
3d504dcb66 Merge latest PGO-green inbounc changeset to m-c. 2013-08-14 14:45:47 +02:00
Ms2ger
4579943f93 Bug 897909 - Cleanup some SIMPLE_PROGRAMS; r=gps 
* * *
FOLD
 2013-08-14 09:00:13 +02:00
Ms2ger
6ec28362b3 Bug 901323 - Don't include nsContentUtils.h unnecessarily; r=jlebar 2013-08-14 08:56:21 +02:00
Nick Fitzgerald
190a3839cf Bug 904196 - sctrict error in onDisplayString; r=vporof 2013-08-13 16:57:05 -07:00
Nick Fitzgerald
b1813995f5 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
e3c63e070e Merge m-c to fx-team. 2013-08-13 16:55:00 -04:00
Ryan VanderMeulen
5f126715b1 Merge m-c to fx-team. 2013-08-13 15:39:41 -04:00
Ryan VanderMeulen
a9619b4c64 Merge m-c to b2g-inbound. 2013-08-13 15:38:58 -04:00
Sotaro Ikeda
48253755a9 Bug 903174 - Move GonkNativeWindow to /widget/gonk/nativewindow. r=vlad 2013-08-13 12:58:38 -04:00
Ryan VanderMeulen
953f240771 Backed out changeset 9baba7e5b351 (bug 872577) for multiple Android failures. 
CLOSED TREE
 2013-08-13 12:51:17 -04:00
Axel Hecht
5d459386c3 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
9fae8ce672 Merge m-c to inbound. 2013-08-13 16:56:11 -04:00
David Rajchenbach-Teller
6af1b24b3b 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
71bd813c02 merge mozilla-central to mozilla-inbound 2013-08-13 13:52:35 +02:00
Ms2ger
0f97870355 Backout changeset 9a57f0f347e3 for insufficient review. 2013-08-13 13:30:00 +02:00
Carsten "Tomcat" Book
4ed1c185c7 merge mozilla-inbound to mozilla-central 2013-08-13 12:34:27 +02:00
Ryan VanderMeulen
a5dba846e8 Merge m-c to fx-team. 2013-08-12 22:00:03 -04:00
Marco Castelluccio
8afb660e73 Bug 903533 - Fix webapps directory creation on Linux. r=felipe 2013-08-12 20:53:24 -03:00
Ryan VanderMeulen
bd41127cb8 Merge fx-team to m-c. 2013-08-12 17:42:19 -04:00
Bobby Holley
d51c959abd Bug 901364 - Remove a bunch of now-unused modal state tracking machinery. r=mrbkap 2013-08-12 12:54:51 -07:00
Ryan VanderMeulen
323c6929cb Merge m-c to fx-team. 2013-08-12 15:37:10 -04:00
Tim Taubert
6e5cd7f746 Bug 903293 - Remote browser constructors shouldn't try to initialize session history; r=felipe 2013-08-12 20:16:11 +02:00
Brandon Benvie
31bc4d26e3 Bug 897256 - Add Debugger Protocol support for NaN, Infinity, and -Infinity. r=dcamp 2013-08-12 10:15:22 -07:00
Chris Pearce
c01b531087 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
f8597dd26f Bug 874435 - Fix lastAccessDate/lastModificationDate typo. r=froydnj 2013-08-12 08:40:42 -04:00
Po-Chun Chang
713372e115 Bug 898238 - Avoid wasted work in nsUrlClassifierDBServiceWorker::CacheCompletions(). r=dcamp 2013-08-12 08:40:19 -04:00
Tim Taubert
d55e57afb0 Bug 904039 - Take devicePixelRatio into account when determining thumbnail size; r=markh 2013-08-12 14:39:56 +02:00
Carsten "Tomcat" Book
da8ed5631f merge mozilla-central to fx-team 2013-08-12 11:41:37 +02:00
Carsten "Tomcat" Book
a883f57a4a merge mozilla-inbound to mozilla-central 2013-08-12 11:28:29 +02:00
Justin Dolske
92ea90040a 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
1c0a912273 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
9a32ee0533 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
295e6faf16 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
3e90d2a8b0 Bug 853388: Load JSON database asynchronously outside of startup; r=unfocused 2013-08-08 16:05:33 -04:00
Irving Reid
324037e41f 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
52872181f2 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
2d1371b14a Bug 853388: Upgrade existing SQLITE databases to JSON; r=unfocused 2013-08-08 15:56:26 -04:00
Irving Reid
bc18fb78c9 Back out 74673d1b1718 for missing reviewer 2013-08-10 19:38:14 -04:00
Irving Reid
323d86b1b7 Back out 2015a41cdf70 for missing reviewer 2013-08-10 19:37:00 -04:00
Irving Reid
ced806a90a Back out 816af0c07c46 for missing reviewer 2013-08-10 19:34:46 -04:00
Irving Reid
3ed8e7469b Back out 629a3e8bd2b1 for missing reviewer 2013-08-10 19:32:34 -04:00
Irving Reid
db5328e9c5 Back out 20d83a7220ca for missing reviewer 2013-08-10 19:27:33 -04:00
Irving Reid
79263953d0 Bug 853388: Keep trying to save JSON even if read or save fails 2013-08-09 20:21:47 -04:00
Irving Reid
80d92b3413 Bug 853388: Load JSON database asynchronously outside of startup 2013-08-08 16:05:33 -04:00
Irving Reid
6853fc84d9 Bug 853388: Trigger XPI database conversion from SQLITE based on schema version preference 2013-08-08 15:56:39 -04:00
Irving Reid
98b63ebf8b 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
ef1d1a7c35 Bug 853388: Upgrade existing SQLITE databases to JSON 2013-08-08 15:56:26 -04:00
Irving Reid
ec5f8eb731 Bug 853388: Save and load XPIProvider state to/from a JSON file; r=unfocused 2013-08-08 15:56:22 -04:00
Ehsan Akhgari
bb99d7ba18 Bug 904001 - Blocklist the old Relevant Knowledge DLLs; r=vlad 2013-08-13 13:27:21 -04:00
Ryan VanderMeulen
f037efce51 Merge m-c to b2g-inbound. 2013-08-14 17:12:43 -04:00
Marco Castelluccio
1f158ced86 Bug 904938 - Fix installLocation problem. r=tabraldes 2013-08-14 16:20:39 -04:00
Neil Rashbrook
41874a96bc Bug 896768 Test for autocompletesearch="file" results r=Mossop 
--HG--
extra : rebase_source : e213d82c9703b1ddf5145768c2ef894260bfc155
 2013-08-12 23:53:56 +01:00
Neil Rashbrook
dcbf688df3 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
7c6f75f871 Merge m-c to inbound. 2013-08-12 17:43:24 -04:00
Guillaume Destuynder
0351bab10b 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
3cc2bdd354 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
843946a7a2 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
b3894384dc Bug 903511 - Rename "GripClient" to "ObjectClient". r=fitzgen 2013-08-13 12:08:30 -04:00
David Rajchenbach-Teller
1932518ca3 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
d6c0a5a359 Bug 898955 - zotero Library navigation pane draws unusual borders. r=dao 2013-08-23 11:06:48 +02:00
Trevor Saunders
b56888f645 fixup backout of bug 902316 on a CLOSED TREE 2013-08-09 23:01:31 -04:00
Trevor Saunders
b609dec9c9 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
1c6c1be9aa Merge m-c to fx-team. 2013-08-09 19:32:24 -04:00
Ryan VanderMeulen
617d547291 Merge fx-team to m-c. 2013-08-09 19:28:34 -04:00
Ryan VanderMeulen
13be9bc4d0 Merge inbound to m-c. 2013-08-09 19:08:45 -04:00
Justin Dolske
34859f75b6 Bug 901409 - Update password manager tests to prepare for bug 355063. r=mattn 2013-08-09 14:56:50 -07:00
Ryan VanderMeulen
305e621852 Merge m-c to fx-team. 2013-08-09 17:29:37 -04:00
Ryan VanderMeulen
c56b4e5a84 Merge b2g-inbound to m-c. 2013-08-09 17:26:14 -04:00
David Rajchenbach-Teller
64a5a5dc82 Bug 902434 - Move Telemetry I/O to TelemetryFile.jsm. r=froydnj 2013-08-09 14:11:09 -04:00
Sunny
64faa076ef 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
56356122fe Bug 900097 - statusbarpanel shouldn't be a button accessible. r=enn 2013-08-08 18:39:56 -04:00
Ryan VanderMeulen
877a258694 Merge m-c to b2g-inbound. 2013-08-08 16:24:53 -04:00
Tim Taubert
931aa5f59b Backed out changeset b3afaf3b4f3a (bug 853388) 2013-08-09 04:20:08 +02:00
Tim Taubert
813a69e5db Backed out changeset 5861a7f63f25 (bug 853388) 2013-08-09 04:20:07 +02:00
Tim Taubert
b51c52b766 Backed out changeset ee904d911f2d (bug 853388) 2013-08-09 04:20:06 +02:00
Tim Taubert
767795ddfe Backed out changeset f3cf78d7e62d (bug 853388) 2013-08-09 04:20:05 +02:00
Tim Taubert
d9d1ab46ea Backed out changeset 40c48d65e382 (bug 853388) 2013-08-09 04:20:03 +02:00
Tim Taubert
7f5ce688b5 Backed out changeset 607b35c777f0 (bug 853388) 2013-08-09 04:20:02 +02:00
Mark Hammond
f9c8c5e605 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
00c715381f Bug 884410 - Remove JS_ValueToECMAInt32 and replace it with JS::ToInt32. r=terrence 2013-08-15 17:41:51 -04:00
Justin Dolske
5bb3221d40 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
cdf866b494 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
9ac2ae09b1 Bug 896748 - Electrolysis: Html 5 notification permission request box doesn't open. r=felipe 2013-07-22 20:24:11 -04:00
Ryan VanderMeulen
4629c7334d Merge m-c to inbound. 2013-08-22 15:44:40 -04:00
Eddy Bruel
6d0507e293 Bug 899052 - Promisify the debugger's live list interface; r=fitzgen 2013-08-21 02:08:48 +02:00
Ryan VanderMeulen
a7872e972f 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
979232b8d2 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
a829a4d782 Bug 853388: Load JSON database asynchronously outside of startup; r=unfocused 2013-08-08 16:05:33 -04:00
Irving Reid
35f24571ad 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
3e37c62ad0 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
c98d3dd56b Bug 853388: Upgrade existing SQLITE databases to JSON; r=unfocused 2013-08-08 15:56:26 -04:00
Irving Reid
c8f557cdc0 Bug 853388: Save and load XPIProvider state to/from a JSON file; r=unfocused 2013-08-08 15:56:22 -04:00
Ryan VanderMeulen
6faa5c58dd Merge m-c to fx-team. 2013-08-08 16:25:37 -04:00
Carsten "Tomcat" Book
5502329773 merge mozilla-central to fx-team 2013-08-08 14:05:38 +02:00
Carsten "Tomcat" Book
f0bfac3d0e merge mozilla-inbound to mozilla-central 2013-08-08 13:13:05 +02:00
Tim Taubert
532b26a16d Backed out changeset ef8248e892e0 (bug 891110) 2013-08-08 05:24:03 +02:00
Karim Hamidou
c1df71b65c Bug 891110 - Detect attempts to pass undefined in declareFFI. r=yoric 2013-08-07 20:19:45 -04:00
Michael Brennan
f6fb97c023 Bug 818225 - Add getThumbnail method to PageThumbs. r=yoric 2013-08-07 22:48:07 +02:00
Valentin Gosu
da213913be Bug 865850 - Integrate about:networking into Firefox. r=ttaubert 2013-08-07 20:15:28 -04:00
Steffen Wilberg
de1adb5f4e 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
0d3342271d Merge m-c to fx-team. 2013-08-07 14:46:19 -04:00
Dave Camp
d22ac243df 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
4d70091eef Bug 901563 - DownloadLegacySaver should move the ".part" file to the target. r=enn 2013-08-07 13:09:04 +02:00
Robert O'Callahan
ff37f49080 Bug 898940. Test. r=jaws 
--HG--
extra : rebase_source : f046ff1f706875c2188ce3593c45d637ddf5a144
 2013-08-07 15:31:25 +12:00
David Rajchenbach-Teller
7c485354a0 Bug 900946 - moduleStack now plays smarter with urls. r=gozala 2013-08-06 17:57:08 -04:00
Alexandre Poirot
661ae7ad91 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
569226ba78 Merge m-c to fx-team. 2013-08-06 14:23:55 -04:00
David Zbarsky
9dd8b1ad80 Bug 902732: Merge nsILink and dom::Link r=bz 2013-08-08 01:26:32 -04:00
Boris Zbarsky
adc8e860c3 Back out revision ab9642207875 (bug 897811) for browser-chrome test failures. 2013-08-08 01:13:45 -04:00
Mark Hammond
71bca9e80b 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
a428bbb020 Merge mozilla-central and inbound 2013-08-07 16:19:03 -07:00
Jonathan Griffin
d2e8a588fb Bug 898074 - Backout c92dc0497dfb, a=test-only 2013-08-07 14:54:31 -07:00
Robert O'Callahan
03cba20737 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
3751cc02c9 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
696edb62f1 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
5bcdb7dac0 Bug 901341 - Multi-option inline settings not initialized properly; r=Unfocused 2013-08-06 23:50:31 +12:00
Ryan VanderMeulen
bed2e900e1 Merge m-c to fx-team. 2013-08-05 23:22:11 -04:00
Ryan VanderMeulen
03f1e9ee4f Merge m-c to inbound. 2013-08-05 20:00:43 -04:00
Justin Lebar
da6fd4c99d Bug 893222 - Part 4: Tests. r=njn 2013-08-05 16:33:00 -07:00
Ryan VanderMeulen
86ae8ca1a0 Backed out changesets fbba341b5faf, 4b2c9adef1e4, and bde98e3a7194 (bug 762593) for mochitest-bc failures. 2013-08-05 16:58:37 -04:00
Marco Castelluccio
1f2a3c5844 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
ce9fe7db3d Merge b2g-inbound to m-c 2013-08-05 11:22:48 +02:00
Carsten "Tomcat" Book
c7c707deba Merge m-i to m-c 2013-08-05 11:18:59 +02:00
Ivan Alagenchev
fdb4e7588b 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
4a21a0ba7d Merge m-c to b2g-inbound. 2013-08-02 19:55:10 -04:00
Dave Hylands
896ba5f067 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
00913f13e0 Merge m-c to fx-team. 2013-08-02 17:09:31 -04:00
Ryan VanderMeulen
3a385f459a Merge inbound to m-c. 2013-08-02 16:36:40 -04:00
Ryan VanderMeulen
e4c4af080d 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
80bd7b2bff Bug 896350 - Don't close notifications unless explicitly requested to. r=blassey 2013-08-02 11:04:49 -07:00
Ed Morley
05a37c3a43 Merge mozilla-central and b2g-inbound 2013-08-02 13:51:22 +01:00
Robert O'Callahan
0164459114 Bug 898946. Avoid #including XPCOM headers within maintenanceservice. r=bbondy 
--HG--
extra : rebase_source : b19663967f7af21daf8f3cf123701a79e295f4b3
 2013-08-02 21:30:06 +12:00
Ms2ger
21409e5d2c Merge m-c to inbound. 2013-08-02 11:07:57 +02:00
Ms2ger
e14e7f77ea Bug 899261 - Use @DEPTH@ more; r=bsmedberg 2013-08-02 09:04:38 +02:00