mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
344 190 коммитов 615 Ветки 98 Теги 5,7 GiB
Граф коммитов

10049 Коммитов

Автор SHA1 Сообщение Дата
Vivien Nicolas 3accc3b5e5 Bug 942021 - Reduce the delay blocking events in order to show the highlight. r=fabrice 2013-11-26 14:50:21 +01:00
Carsten "Tomcat" Book 8fdb691147 merge b2g-inbound to mozilla-central 2013-11-26 12:40:07 +01:00
Randell Jesup 671ca425f3 Bug 942343: pref off RTCPeerConnection for B2G until it's functional r=ekr,smaug,jsmith 2013-11-24 19:46:39 -05:00
Carsten "Tomcat" Book bd8bd89987 Backed out changeset 2cae126450b2 (bug 942343) suspicion of causing mochitest 4 and 8 bustage on B2G ICS Emulator Opt on a CLOSED TREE 2013-11-25 08:41:57 +01:00
Randell Jesup e250b8f1d4 Bug 942343: pref off RTCPeerConnection for B2G until it's functional r=ekr 2013-11-24 19:46:39 -05:00
Ehsan Akhgari aac8d81bcb Bug 942486 - Move PL_ARENA_CONST_ALIGN_MASK out of nsZipArchive.h; r=mwu 
--HG--
extra : rebase_source : 92410d30a1f8ae6d9df4fb6e6b278dc6307460a0
 2013-11-25 15:44:25 -05:00
Chris Peterson 964bd2f984 Bug 942587 - Do not cloak "Nexus Personal" BankID plugin name. r=bsmedberg 
--HG--
extra : rebase_source : 1aae87bfdf3e94f6b0decbde260f927a97eec86a
 2013-11-24 22:14:41 -08:00
Mike Hommey 9d53a70364 Bug 941475 - Remove old workaround for gcc 3.2.2 (!) on OS/2 (!). r=mshal 2013-11-22 08:16:19 +09:00
Chris Peterson a603d9c90c Bug 757726 - Part 6b: Cloak all plugin names except Flash, Director, Java, and QuickTime. r=johns sr=bsmedberg 2013-11-21 19:44:38 -08:00
Chris Peterson cf1496031d Bug 757726 - Part 6a: Add support for cloaking plugin names in navigator.plugins and navigator.mimeTypes enumeration. r=johns sr=bsmedberg 2013-10-31 22:19:09 -07:00
Ehsan Akhgari 86afd352d7 Bug 941866 - Exclude files which rely on the known bad patterns from unified builds; r=BenWa 2013-11-21 16:36:59 -05:00
Carsten "Tomcat" Book d37c2cf578 Backed out changeset e8271988688e (bug 887978) for Mochitest 2/3 Bustage on a CLOSED TREE 2013-11-21 13:23:37 +01:00
Ralph Giles af188fbbc1 Bug 887978 - Pref on WebVTT for non-release builds. r=cpearce 
This allows us to get wider testing without having to worry
about flipping the pref back off for release if we find problems.
 2013-11-20 18:23:00 +13:00
Oleg Romashin c02ba0fedc Bug 822898 - Implement pointer events. Interface. r=smaug 2013-11-20 21:44:22 -08:00
Oleg Romashin 117dfcdce3 Backed out 3 changesets (bug 822898) for mochitest bustage on B2G ICS emulator 2013-11-20 16:08:36 -08:00
Oleg Romashin dbdb925adf Bug 822898 - Implement pointer events. Interface. r=smaug 2013-11-20 13:05:39 -08:00
Chris Pearce 7125ddf4eb Bug 886196 - Create a PlatformDecoderModule that outputs blank frames for fuzzing/testing purposes. r=kinetik 2013-11-21 10:04:33 +13:00
Chris Pearce 2547f6703f Bug 886196 - Add pref to enable creation of fmp4 reader in DecoderTraits. Preffed of by default. r=kinetik 2013-11-21 10:04:33 +13:00
Chris Pearce 863750a7ce Bug 886196 - Configure option and pref for fragmented mp4 parser. r=glandium 2013-11-21 10:04:32 +13:00
Jonathan Kew 103b972b31 bug 928026 - use Roboto / Droid Sans Mono for Greek, until Fira glyphs are revised. r=mwu 2013-11-19 21:46:47 +00:00
Johannes Buchner 6d6385c6cc Bug 912465 - Use MsgNewSafeBufferedFileOutputStream instead of NewLocalFileOutputStream in various places. r=ehsan 2013-11-19 09:13:44 -05:00
Mike Hommey 2812d11fce Bug 939632 - Remove LIBRARY_NAME for leaf libraries. r=gps 
Landing on a CLOSED TREE.
 2013-11-19 11:50:54 +09:00
Mike Hommey e06d795c71 Bug 939074 - Remove most LIBXUL_LIBRARY. rs=gps 2013-11-19 11:48:10 +09:00
Mike Hommey 26bc04d200 Bug 939044 - Rename remaining MODULE definitions to XPIDL_MODULE. r=mshal 2013-11-19 11:47:43 +09:00
Mike Hommey e80e877ab7 Bug 939044 - Remove most definitions of MODULE. r=mshal 2013-11-19 11:47:39 +09:00
Mike Hommey ffe0380912 Bug 935881 - Use FINAL_LIBRARY for all (fake) libraries that end up linked in a single other library. r=gps 2013-11-19 11:47:14 +09:00
Wes Kocher 0f82ea91e0 Backed out 3 changesets (bug 822898) for mochitest bustage on Windows on a CLOSED TREE 
Backed out changeset 63c1f6716755 (bug 822898)
Backed out changeset 145150ef00a5 (bug 822898)
Backed out changeset a5e360e6d713 (bug 822898)
 2013-11-18 15:27:53 -08:00
Oleg Romashin 9610bdbf38 Bug 822898 - Implement pointer events. Interface. r=smaug 2013-11-18 13:10:05 -08:00
Ryan VanderMeulen f370741daa Merge m-c to inbound on a CLOSED TREE. 2013-11-18 10:59:48 -05:00
Jonathan Watt 449658efa0 Bug 889736, part 6 - Stop setting the svg.text.css-frames.enabled pref. r=heycam 2013-11-18 14:29:53 +00:00
Gijs Kruitbosch 65c5bb5207 Merge m-c to ux 2013-11-18 13:44:32 +01:00
Ed Morley f995e4214b Merge latest green inbound changeset and mozilla-central 2013-11-18 10:39:38 +00:00
Gijs Kruitbosch c3218cf205 Merge m-c to ux 2013-11-17 23:37:53 +01:00
Christian Legnitto 3948d15ac9 Bug 935377 - Firefox should fix common scheme typos, r=bz 2013-11-17 12:16:45 -08:00
Gijs Kruitbosch cc2610edfd Merge mozilla-central and ux 2013-11-15 18:32:01 +01:00
Gijs Kruitbosch af6f8f6fef Merge mozilla-central and ux 2013-11-12 09:27:50 +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
Matthew Gregan 5ccd288bd0 Bug 935349 - Remove disabled DASH code. r=doublec 2013-11-07 17:08:30 +13:00
Gijs Kruitbosch 7847dc3be9 Merge m-c to ux 2013-11-06 14:36:26 +01:00
Gijs Kruitbosch 7211b5e0ad Merge mozilla-central and ux 2013-11-06 09:01:08 +01:00
Nicholas Nethercote 3eae0dfea5 Bug 934321 - Add MemoryMultiReporter, a helper class that reduces some boilerplate, and convert all existing multi-reporters to use it. r=wchen. 
--HG--
extra : rebase_source : a6110c3558c571b7908b63e8cc7ca21103098d0d
 2013-11-06 14:58:20 +11:00
Wes Kocher 27d09036f4 Merge inbound to m-c 2013-11-05 17:50:18 -08:00
Wes Kocher e612f4f8f3 Merge fxteam to m-c 2013-11-05 17:38:24 -08:00
Jonathan Kew 634d03a308 bug 797405 - use harfbuzz on Windows for all text shaping except Hangul. r=jdaggett 2013-11-05 13:49:10 +00: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
Rik Cabanier fa242077eb Bug 540456 - Support HTML5 canvas draw{Custom,System}FocusRing(). r=smaug 2013-11-04 14:52:24 -05:00
Gijs Kruitbosch b035f59a74 Merge mozilla-central and ux 2013-11-02 11:33:53 +01: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
Gijs Kruitbosch f298c06fde Merge mozilla-central and ux 2013-11-01 09:20:15 +01:00
Ryan VanderMeulen 1d57260a86 Merge m-c to inbound on a CLOSED TREE. 2013-10-30 22:42:13 -04:00
Matt Woodrow cb73971347 Bug 934533 - Remove the azure content enabled pref since we require it to be enabled for all platforms now. r=nrc 
--HG--
extra : rebase_source : f5152dd3c088009c80cda2844589967ed047e888
 2013-11-06 08:54:12 +13:00
Chris Peterson 5e2403c49f Bug 939120 - Build modules/libbz2 and libjar in unified mode. r=ehsan 2013-11-12 22:30:37 -08:00
Gian-Carlo Pascutto cef96a16b8 Bug 902000 - Make the load adaption depend on a pref. r=jesup 2013-10-29 15:00:28 +01:00
Simon Montagu b3bd920dc4 Add Apple SD Gothic Neo to Korean default font list for OSX 10.8. Bug 923713, r=jdaggett 2013-11-04 06:18:13 -08: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
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
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
Monica Chew 705586a6a6 Bug 895476: Enable updating local lists for application reputation (r=gcp) 2013-10-31 14:15:14 -07:00
Dave Townsend b15bec5738 Bug 935596 : nsJARInputStream crashes debug builds when it encounters a corrupt zip file. r=taras 2013-11-07 11:32:55 -08:00
Matthew Gregan aa1e8d3d40 Bug 927245 - Pref off deprecated Audio Data API implementation. r=ehsan 2013-10-23 15:31:28 +13:00
Chia-hung Tai 1228cd0bfe Bug 921917 - B2G MMS: Provide a flag to let user be able to request read report or not when sending MMS. r=gene 2013-10-30 11:48:47 +08:00
Ed Morley c4fca9c7f5 Merge mozilla-central and b2g-inbound 2013-10-29 16:34:46 +00:00
Vicamo Yang 152523ac25 Bug 920551 - 2.f/2: fix Voicemail. r=hsinyi,khuey 2013-10-29 16:12:42 +08:00
Vicamo Yang 812e055581 Bug 920551 - 2.e/2: fix MobileConnection. r=hsinyi,khuey 2013-10-29 16:12:41 +08:00
Vicamo Yang c6917c2beb Bug 920551 - 2.d/2: fix ICC. r=hsinyi,khuey 2013-10-29 16:12:40 +08:00
Vicamo Yang 600a32f491 Bug 920551 - 2.c/2: fix CellBroadcast. r=hsinyi 2013-10-29 16:12:39 +08:00
Vicamo Yang 131eae1652 Bug 920551 - 2.b/2: fix Telephony. r=hsinyi,khuey 2013-10-29 16:12:38 +08:00
Mats Palmgren 4d866337f3 Bug 929991 - Put 'text-align: true X' support behind a preference (disabled by default). r=heycam 2013-10-27 20:56:32 +00:00
Garrett Robinson 1da990368c Bug 855326 - CSP 1.1 nonce-source for scripts and styles r=mrbkap r=dholbert r=geekboy 2013-11-08 15:44:39 -08:00
Daniel Holbert 22a34fc8b5 Bug 936100 part 6: Remove flexbox pref from all.js. r=mats 2013-11-09 07:53:32 -08:00
Carsten "Tomcat" Book ae6f76e443 Merge mozilla-central to mozilla-inbound 2013-11-09 12:25:41 +01:00
Dão Gottwald aca41eac50 Bug 936513 - Remove unused general.useragent.enable_overrides pref. r=nchen 2013-11-08 22:24:02 +01:00
Horia Iosif Olaru 56504fb58d Bug 841601 - Add background-blend-mode to the style parsing mechanism. r=heycam 2013-11-08 10:07:36 -05:00
Mike Hommey a470038314 Bug 935305 - Move preprocessor to mozbuild.action. r=gps 
--HG--
rename : config/Preprocessor.py => python/mozbuild/mozbuild/preprocessor.py
rename : config/tests/unit-Expression.py => python/mozbuild/mozbuild/test/test_expression.py
rename : config/tests/unit-LineEndings.py => python/mozbuild/mozbuild/test/test_line_endings.py
rename : config/tests/unit-Preprocessor.py => python/mozbuild/mozbuild/test/test_preprocessor.py
 2013-11-09 10:35:44 +09:00
Daniel Holbert 9a3437dd77 backout 57213b64023b (bug 855326) for build bustage in debug builds 
CLOSED TREE
 2013-11-08 11:22:36 -08:00
Garrett Robinson 5add685cdd Bug 855326 - CSP 1.1 nonce-source for scripts and styles. r=mrbkap r=dholbert r=geekboy 2013-11-08 09:20:43 -08:00
Timothy Nikkel 2cdfe9a734 Bug 930535. Enable image visibility on b2g inside browser elements. r=mats 2013-10-26 19:17:52 -05:00
Nicholas Hurley 14a7d1f5a2 Bug 881804 (part 1) - Add support for predictive network actions. r=mcmanus f=honzab sr=biesi 2013-10-25 14:56:51 -07:00
Benoit Girard 5aa117f19b Bug 936511 - Add layers.dump to dump layer tree. r=bas,nrc 2013-11-17 16:47:40 -05:00
Cykesiopka d2f6b7333c Bug 914270 - Part 1: Simple/Automated moves. r=joey 2013-10-24 18:51:00 +01:00
Carsten "Tomcat" Book 75604a8ce8 Merge B2g-inbound to Mozilla-Central 2013-10-25 11:48:38 +02:00
Mike Hommey b000a846c2 Bug 929905 - Consolidate sources in moz.build. r=gps 2013-10-25 08:23:05 +09:00
Vicamo Yang 7424816c3c Bug 926302 - 2.b/3: implementation. r=gene,hsinyi,khuey 2013-10-24 16:15:06 +08:00
Carsten "Tomcat" Book 0e4e01758c Merge mozilla-inbound to Mozilla-Central 2013-10-24 07:05:29 +02:00
Mike Hommey 59a17d0f20 Bug 921492 - Make StrictOrderingOnAppendList use actual alphabetical sorting. r=mshal,r=gps 2013-10-24 08:05:43 +09:00
Kartikaya Gupta f0af958413 Bug 929367 - Rename all the prefs for the async pan/zoom code to be consistent. r=botond,mbrubeck 2013-10-24 00:07:50 +02:00
Daniel Holbert cc038cbc31 Bug 929466: Cast '0' + known-small-uint32_t to type "char" in comparison within mar.c, to fix sign-compare build warning. r=bbondy 2013-10-23 08:22:32 +02:00
Joshua Cranmer f6366dd338 Bug 935789, part 1: Kill most uses of prbit.h, r=ehsan 
--HG--
extra : rebase_source : 4c44e60c72e0ece3cea7ed1cf79079bd2a1b6487
 2013-11-12 18:22:38 -06:00
Bobby Holley 358692053b Bug 840488 - Introduce a mechanism to temporarily or permanently block script for a given scope, and use it for unsafe channels. r=bz 2013-11-12 16:43:33 -08:00
Arnaud Bienner b7d6e57361 Bug 930277 - Toggle dom.forms.color on everywhere but on B2G, Android and Metro as these platforms don't have a color picker ready yet. r=dholbert 2013-10-28 19:56:59 +01:00
Birunthan Mohanathas 9722682a5a Bug 784739 - Switch from NULL to nullptr in modules/; r=ehsan 
--HG--
extra : rebase_source : d82c3e2e18986d3b9ffc454ff84caf3634a6bbe7
 2013-10-23 16:36:26 -04:00
Jonathan Kew 60a897da37 bug 877203 pt 3 - update font prefs for Android to refer to Clear Sans. r=blassey 2013-10-23 22:04:40 +02:00
Mark Banner f5329402cf Bug 920991 - Default stun server ip address should be changed to a domain name. r=abr 2013-10-23 09:59:37 +01:00
Seth Fowler f3ffa0c710 Bug 764299 (Part 2) - Add a temporary surface cache to imagelib. r=dholbert 2013-10-22 13:37:59 +02:00
Kannan Vijayan 809746b013 Backout 5a0801040b54, 5bedd82346b4, 4d8068fd3271, and bc31e05eddb8 for b2g build breakage. CLOSED TREE. 2013-10-21 14:39:33 -04:00
Seth Fowler 4076d6db32 Bug 764299 (Part 2) - Add a temporary surface cache to imagelib. r=dholbert 2013-10-21 18:10:43 +02:00
Ehsan Akhgari abcacdab4c Bug 928712 - Remove the rest of the unneeded prtypes.h inclusions; rs=bsmedberg 2013-10-20 22:59:48 -04:00
Ehsan Akhgari 335322b66d Backed out changeset 0ddbf9b3b20c (bug 928712) because of build bustage 2013-10-20 09:42:51 -04:00
Ehsan Akhgari 36f759e186 Bug 928712 = Remove the rest of the unneeded prtypes.h inclusions; rs=bsmedberg 2013-10-20 09:10:07 -04:00
Ms2ger b7619cd23d Bug 923395 - Part a: Remove completely empty makefiles; r=gps 2013-10-20 09:25:18 +02:00
Brad Lassey 70dce7435c bug 742832 - Add support for tab sharing for getUserMedia r=jesup 
--HG--
extra : rebase_source : e42fbab31083b0e91be9992b2ba0062d14294c25
 2013-10-17 16:48:30 -04:00
Carsten "Tomcat" Book 18e7416841 merge b2g-inbound to mozilla-central 2013-10-18 11:39:28 +02:00
Vicamo Yang 1b6c47fe99 Bug 915604: Hide RIL DOM APIs from regular Web pages. r=khuey, f=emk 2013-10-18 04:51:27 +08:00
Vivien Nicolas 542d7cb5d8 Bug 863702 - [B2G] :active state is sometime not rendered if you tap quickly. r=fabrice 2013-10-17 09:18:13 +02:00
Gijs Kruitbosch a7d75a9eb1 Merge mozilla-central and ux 2013-10-29 17:23:48 +01:00
Gijs Kruitbosch 686af64168 Merge m-c to ux 2013-10-28 10:18:27 +01:00
Gijs Kruitbosch aceea3dc8b merge m-c to UX 2013-10-27 21:18:18 +01:00
Matthew Noorenberghe 0ba166e52e Merge mozilla-central to UX 2013-10-25 18:30:46 -07:00
Gijs Kruitbosch 0aa036514a Merge mozilla-central and ux 2013-10-25 10:23:03 +02:00
Gijs Kruitbosch 7af76e1cdc Merge mozilla-central and ux 2013-10-24 10:18:26 +02:00
Gijs Kruitbosch 0dcf8beb08 Merge mozilla-central and ux 2013-10-23 15:41:02 +02:00
Gijs Kruitbosch 8223d647f4 Merge mozilla-central and ux 2013-10-23 10:44:46 +02:00
Gijs Kruitbosch ef9057f594 Merge mozilla-central and ux 2013-10-22 10:34:17 +02:00
Gijs Kruitbosch baffbbf48b Merge mozilla-central and ux 2013-10-20 12:33:18 +02:00
Gijs Kruitbosch b16f361a83 Merge mozilla-central and ux 2013-10-19 12:28:13 +02:00
Gijs Kruitbosch 2b30d3ad35 Merge m-c to UX 2013-10-18 12:56:16 +02:00
Gijs Kruitbosch 9e08212619 Merge mozilla-central and ux 2013-10-17 13:48:43 +02:00
Gijs Kruitbosch 052c10952d Merge mozilla-central and ux 2013-10-16 10:20:09 +02:00
Gijs Kruitbosch 2f4b343115 Merge mozilla-central and ux 2013-10-15 15:37:45 +02:00
Gijs Kruitbosch a5d4fcfa22 Merge m-c to ux 2013-10-13 23:58:05 +02:00
Shian-Yow Wu 7fc5baaade Bug 881935 - Part 2: Device configuration for max-fs and max-fr. r=derf 2013-10-13 09:44:50 +08:00
Mina Almasry a4c51500ad Bug 698437 - Allow spatial navigation with directional controller. r=kats 2013-10-12 13:59:50 -04:00
Chris Peterson a9889b0ce1 Bug 926583 - Fix -Wbitwise-op-parentheses warning in nsZipHeader.cpp. r=dtownsend 2013-10-11 17:49:51 -07:00
Gijs Kruitbosch b4a7a6d253 Merge mozilla-central and ux 2013-10-11 10:08:05 +02:00
Gijs Kruitbosch cf76828190 Merge mozilla-central and ux 2013-10-10 20:23:18 +02:00
Justin Dolske 9c51157bdb Bug 717490 - Remove support for importing logins from legacy signons.txt format, as well as base64 conversion. r=mattn 2013-10-09 17:48:40 -07:00
Gijs Kruitbosch 09de8b70e1 Merge mozilla-central and ux 2013-10-04 07:51:17 +02:00
Cameron McCormack c84a91e660 Bug 842329 - Part 0: Add "layout.css.all-shorthand.enabled" pref. r=bzbarsky 2013-10-04 04:49:19 +10:00
Cameron McCormack b95c636898 Bug 921731 - Part 0: Add "layout.css.unset-value.enabled" pref. r=bzbarsky 2013-10-04 04:48:41 +10:00
Gijs Kruitbosch 4ef230e3b8 Merge m-c to ux 2013-10-03 17:20:04 +02:00
Phil Ringnalda e55ebbb920 Merge m-i to m-c 2013-10-03 07:58:59 -07:00
Matt Brubeck d0f97c46f6 Merge fx-team to mozilla-central 2013-10-03 07:38:41 -07:00
Ms2ger 4c35b806f8 Merge m-c to inbound. 2013-10-03 11:09:17 +02:00
Ms2ger f4153f40d4 Bug 900980 - Part a: Move unconditional assignments to EXPORT_LIBRARY to moz.build; rs=gps 2013-10-03 09:11:13 +02:00
Ms2ger 1ee1f27aa3 Bug 922268 - Remove empty makefiles; r=gps 2013-10-03 09:10:00 +02:00
Gijs Kruitbosch 581cdb7e45 Merge mozilla-central and ux 2013-10-02 20:41:14 +02:00
Matt Brubeck 1403178461 Bug 892684 - Implement axis locking in AsyncPanZoomController [r=kats,botond] 2013-10-02 18:03:04 -07:00
Gijs Kruitbosch d4692f3c09 Merge m-c to UX 2013-10-01 12:00:42 +02:00
Matt Woodrow abb8ca3c51 Bug 916034 - Enable azure content for gtk2. r=jrmuizel 2013-10-02 22:12:36 +13:00
Matt Woodrow 0bf249a658 Bug 922007 - Use the new texture clients and hosts on fennec. r=mattwoodrow 2013-10-01 14:41:07 +13:00
Gijs Kruitbosch e69a32b297 Merge m-c to UX 2013-10-01 00:36:26 +02:00
Ryan VanderMeulen 1f31fb75a5 Merge fx-team to m-c. 
--HG--
rename : mobile/android/base/UpdateServiceHelper.java => mobile/android/base/updater/UpdateServiceHelper.java
 2013-09-30 16:18:53 -04:00
Gijs Kruitbosch 049fc011e0 Merge mozilla-central and ux 2013-09-30 19:26:47 +02:00
Ed Morley 64e17995e6 Merge mozilla-central and inbound 2013-09-30 17:26:43 +01:00
Ed Morley 2e4201cbf8 Merge mozilla-central and fx-team 2013-09-30 17:21:02 +01:00