Mike Conley
2a59bbb0d2
Automated merge with https://hg.mozilla.org/mozilla-central
2013-05-23 09:39:09 -04:00
Gijs Kruitbosch
0b5ed2e369
Bug 874448 - OS X customization mode doesn't have dragover border indicators on toolbarpaletteitems, r=dao
2013-05-22 11:37:06 +02:00
Mike Conley
228be11537
Automated merge with https://hg.mozilla.org/mozilla-central
2013-05-21 14:49:59 -04:00
Ryan VanderMeulen
88a926596c
Backed out changeset 4cb1973f06b9 (bug 868439) for Android M2 failures.
...
CLOSED TREE
2013-05-21 10:48:09 -04:00
Mike Conley
7bd0d6c524
Automated merge with https://hg.mozilla.org/mozilla-central
2013-05-20 22:56:50 -04:00
Ryan VanderMeulen
749a427089
Merge m-c to fx-team.
2013-05-20 16:22:54 -04:00
Mihai Sucan
c71010cc83
Bug 863818 - console.log messages don't appear in the Web Console when connecting to 'shell.xul' via Simulator; r=past
2013-05-16 22:54:40 +03:00
Boris Zbarsky
810766595d
Bug 873735 part 2. Change nsIXPConnectJSObjectHolder::GetJSObject to return a JSObject*. r=bholley
2013-05-20 08:44:18 -04:00
Gregory Szorc
c1b865f669
Bug 873629 - Remove 129 empty Makefile.in files; r=ted
2013-05-17 16:20:11 -07:00
Ryan VanderMeulen
64bb07971b
Merge m-c to inbound on a CLOSED TREE.
2013-05-17 17:34:54 -04:00
Ryan VanderMeulen
1732f4e103
Backed out changesets 073791f33ab7 and 7ac5779a426c (bug 859756) for causing intermittent Windows build failures.
...
CLOSED TREE
2013-05-17 17:30:20 -04:00
Ryan VanderMeulen
1575a033a0
Merge m-c to fx-team.
2013-05-17 12:51:20 -04:00
Mihai Sucan
5f4fe12638
Bug 859756 - [browserconsole] Show nsIConsoleMessages in the Browser Console; r=robcee
2013-05-17 13:36:56 +03:00
Ryan VanderMeulen
fe42f20b48
Merge m-c to inbound.
2013-05-17 09:08:44 -04:00
Ryan VanderMeulen
2864f1ae0a
Merge m-c to birch.
2013-05-16 20:31:26 -04:00
Ryan VanderMeulen
3b2fb8dd48
Merge inbound to m-c.
2013-05-16 20:29:40 -04:00
Sotaro Ikeda
5e9a341b9b
Bug 871753 Part2 - add libstagefright_foundation r=mwu
2013-05-16 17:24:20 -07:00
Ryan VanderMeulen
0789066b2f
Merge m-c to fx-team.
2013-05-16 16:19:25 -04:00
Panos Astithas
6b052b1e91
Bug 871510 - Some event handlers appear as undefined, hiding the appropriate null values in the prototype; r=msucan
2013-05-16 18:42:15 +03:00
Mihai Sucan
1c4ff5e9b2
Bug 871156 - Allow Ctrl+W to close the tab when the Web Console is focused; r=robcee
2013-05-16 15:35:53 +03:00
Victor Porof
36e4594c52
Merge m-c to fx-team
2013-05-16 10:32:06 +03:00
Ryan VanderMeulen
d9824dd1e6
Merge inbound to m-c.
2013-05-15 21:14:58 -04:00
Brian R. Bondy
bc92d73e1a
Bug 572162 - Changes to tests for update root hash changes. r=rstrong
2013-05-15 10:58:09 -07:00
Brian R. Bondy
9227520b87
Bug 572162 - Use TaskbarIDs hash as update dir root. r=rstrong
2013-05-15 10:58:09 -07:00
Brian R. Bondy
a46e80d61f
Bug 572162 - Cleanup new update directory and obsolete old after updates and installs. r=rstrong
2013-05-15 10:58:09 -07:00
Brian R. Bondy
f153980081
Bug 572162 - Update root dir migration xpcshell tests. r=rstrong
2013-05-15 10:58:09 -07:00
Brian R. Bondy
7b78adf4e8
Bug 572162 - Migrate update files to new update directory after updates. r=rstrong
2013-05-15 10:58:09 -07:00
Panos Astithas
39041b6f58
Fix another typo in Loader.jsm (bug 867485); r=dcamp
2013-05-15 17:22:01 +03:00
Mike Conley
f2768f6df2
Automated merge with https://hg.mozilla.org/mozilla-central
...
--HG--
rename : toolkit/content/LightweightThemeConsumer.jsm => toolkit/modules/LightweightThemeConsumer.jsm
2013-05-17 11:48:25 -04:00
Panos Astithas
a318e18c6a
Fix a few typos in Loader.jsm (bug 867485); r=jwalker
2013-05-14 12:48:18 +03:00
Mike Hommey
67377e6991
Bug 874783 - Fix l10n builds after bug 848764. r=ted
2013-05-23 07:27:20 +02:00
Ryan VanderMeulen
a4f7bfe426
Merge m-c to fx-team.
2013-05-13 16:33:59 -04:00
Ryan VanderMeulen
5187701658
Merge m-c to inbound.
2013-05-13 12:02:04 -04:00
Ryan VanderMeulen
520843a801
Merge m-c to birch.
2013-05-13 09:53:32 -04:00
Gijs Kruitbosch
5fc3a07279
Bug 865316 - Fix styling of dropmarkers and borders for toolbarbutton-menu and toolbarbutton-menu-dropmarker, r=dao
2013-05-13 14:59:18 +02:00
Nick Fitzgerald
f3952f8e0a
Bug 865252 - Don't heavily prefer cache when loading source mapped sources; r=rcampbell
2013-05-13 14:53:00 +03:00
Ed Morley
ce3fdf2758
Backed out changeset 2d5c2f191920 (bug 863445) for breaking Android Nightlies
...
--HG--
rename : mobile/android/base/fennec-ids-generator.py => build/mobile/robocop/parse_ids.py
2013-05-13 12:31:39 +01:00
Ed Morley
bcdd00043e
Backed out changeset dac51812454a (bug 863445)
2013-05-13 12:31:10 +01:00
Nick Fitzgerald
cbadb04b92
Bug 852792 - load sources from the 'sourcesContent' field in a source map, if available; r=rcampbell
2013-05-13 14:16:00 +03:00
Nick Alexander
298ff2d2c5
Merge mozilla-central into services-central.
2013-05-12 16:19:27 -07:00
L. David Baron
244d007fec
Merge mozilla-inbound and mozilla-central.
...
(The mozilla-central side of the merge is entirely a merge from fx-team into mozilla-central.)
2013-05-11 22:00:23 -07:00
Nick Alexander
b96eb5d3c3
Bug 863445 - Part 3: Make build/mobile/robocop/Makefile.in produce robocop-debug-signed.apk. r=jmaher
...
Also makes the developer-facing `make mochitest-robocop` run
robocop-debug-signed.apk, and deprecates `make
mochitest-robotium` (since we name this suite robocop on TBPL).
2013-05-11 16:53:49 -07:00
Nick Alexander
bc0efccf06
Bug 863445 - Part 1: Make mobile/android/base/Makefile.in generate $(DIST)/fennec_ids.txt. r=jmaher
...
--HG--
rename : build/mobile/robocop/parse_ids.py => mobile/android/base/fennec-ids-generator.py
2013-05-11 16:53:48 -07:00
Joe Walker
9751893e70
Merge mozilla-central into fx-team
2013-05-11 15:11:54 +01:00
Ryan VanderMeulen
c3ad278e44
Merge m-c to inbound on a CLOSED TREE.
2013-05-11 09:49:12 -04:00
Ryan VanderMeulen
cd944c80b9
Backed out changeset 080912624060 (bug 869209) for Android xpcshell failures.
...
CLOSED TREE
2013-05-11 08:14:34 -04:00
Joe Walker
463c85bd35
Backed out changeset 6ebf2274acf5 (Bug 852792) for xpcshell bustage
2013-05-11 12:13:09 +01:00
Joe Walker
21be16980e
Backed out changeset 752dca088d71 (Bug 865252) for xpcshell bustage
2013-05-11 12:08:58 +01:00
Nick Alexander
78284a8764
Backed out e7739a472f09, 3fd142236a0f, and 382ec69cdfb1 (Bug 863445) for Android rc1 and rc2 failures on a CLOSED TREE. r=me
...
--HG--
rename : mobile/android/base/fennec-ids-generator.py => build/mobile/robocop/parse_ids.py
2013-05-10 21:38:52 -07:00
Nick Alexander
2d0fd713b6
Bug 863445 - Part 3: Make build/mobile/robocop/Makefile.in produce robocop-debug-signed.apk. r=jmaher
...
Also makes the developer-facing `make mochitest-robocop` run
robocop-debug-signed.apk, and deprecates `make
mochitest-robotium` (since we name this suite robocop on TBPL).
2013-05-10 18:39:00 -07:00