Commit Graph

90 Commits

Author SHA1 Message Date
Alex Keybl
8ba34e2e06 Added tag FIREFOX_AURORA_26_BASE for changeset 2520866d5874 2013-09-17 09:36:55 -04:00
Bhavana Bajaj
bb0fdd58dd Added tag FIREFOX_AURORA_25_BASE for changeset ad0ae007aa9e 2013-08-05 10:56:53 -07:00
Alex Keybl
c3397c9c45 Added tag FIREFOX_AURORA_24_BASE for changeset 8d3810543edc 2013-06-24 11:36:44 -07:00
Lukas Blakk
e61eec7276 Added tag FIREFOX_AURORA_23_BASE for changeset d7ce90899997 2013-05-13 09:15:11 -07:00
Bhavana Bajaj
f25765fd46 Added tag FIREFOX_AURORA_22_BASE for changeset 1c070ab0f9db 2013-04-01 11:21:20 -07:00
Lukas Blakk
9b3ceb1816 Added tag FIREFOX_AURORA_21_BASE for changeset cc37417e2c28 2013-02-19 09:30:50 -08:00
Alex Keybl
25d3a39306 Added tag FIREFOX_AURORA_20_BASE for changeset 5bb309998e70 2013-01-07 12:29:21 -08:00
Alex Keybl
0c4523e1ee Added tag FIREFOX_AURORA_19_BASE for changeset cf8750abee06 2012-11-19 11:56:01 -08:00
Alex Keybl
776beb51db Added tag FIREFOX_AURORA_18_BASE for changeset 2704e441363f 2012-10-08 10:57:38 -07:00
Alex Keybl
5f67172da8 Added tag FIREFOX_AURORA_17_BASE for changeset fd72dbbd6920 2012-08-27 12:19:51 -07:00
Lukas Blakk
5afd78242d Added tag FIREFOX_AURORA_16_BASE for changeset 6fdf9985acfe 2012-07-16 10:17:04 -07:00
Lukas Blakk
4e611429b0 Added tag FIREFOX_AURORA_16_BASE for changeset 9697eadafa13 2012-07-16 10:09:16 -07:00
Lukas Blakk
1d83c46b16 Merging in version bump NO BUG 2012-07-16 10:08:20 -07:00
Lukas Blakk
37dc554f47 Added tag FIREFOX_AURORA_15_BASE for changeset 26dcd1b1a208 2012-06-04 12:33:54 -07:00
Lukas Blakk
7e7467e72a Added tag FIREFOX_AURORA_14_BASE for changeset 357da346ceb7 2012-04-24 12:50:38 -04:00
cltbld
5315d473ed Added tag FIREFOX_AURORA_13_BASE for changeset b6627f28b7ec 2012-03-13 13:33:44 -07:00
Boris Zbarsky
23a2fe2f05 Added tag AURORA_BASE_20120131 for changeset bbc7014db2de 2012-02-01 12:24:29 -05:00
Alex Keybl
1397a1a058 Bug 700000 - Version bump 2012-01-31 10:57:49 -08:00
Alex Keybl
8f50af1b07 Added tag AURORA_BASE_20120131 for changeset bbc7014db2de 2012-01-31 10:17:43 -08:00
Ben Hearsum
136bc6f521 Bug 607389 - generate partial updates at build time for releases. DONTBUILD 2012-01-24 09:18:44 -05:00
Christian Legnitto
638d0d5c8d Added tag AURORA_BASE_20111220 for changeset a8506ab2c654 2011-12-20 09:14:30 -08:00
Christian Legnitto
408bf66de0 Added tag AURORA_BASE_20111108 for changeset 54bfd8bf682e 2011-11-08 09:06:38 -08:00
Nick Thomas
d62d229272 Bug 682805, add tag UPDATE_PACKAGING_R15 (on R14), a=legneato DONTBUILD 2011-10-26 12:09:03 +13:00
Boris Zbarsky
f8ac434efa Added tag AURORA_BASE_20110927 for changeset c0983049bcaa to CLOSED TREE, DONTBUILD 2011-09-27 13:09:13 -04:00
Ehsan Akhgari
92239fe455 Added tag AURORA_BASE_20110816 for changeset 41b84b87c816 on a CLOSED TREE DONTBUILD 2011-08-16 14:13:48 -04:00
Boris Zbarsky
822098fe31 Added tag AURORA_BASE_20110705 for changeset 5eb553dd2cea 2011-07-05 12:54:15 -04:00
Ben Hearsum
ac42f7eb0a Move UPDATE_PACKAGING_R14 tag to pick up bug 658094. DONTBUILD 2011-05-26 19:51:50 -04:00
Ehsan Akhgari
864a9ab42c Added tag AURORA_BASE_20110524 for changeset 9eae975b3d6f, landing on a CLOSED TREE for the Aurora merge
DONTBUILD
2011-05-24 13:15:02 -04:00
Ben Hearsum
7de32d0979 Create UPDATE_PACKAGING_R14 tag to satisfy release automation. DONTBUILD
--HG--
extra : rebase_source : f4b4eed2f02b59ab7e90285302d93da6aec58c8a
2011-05-19 09:12:52 -04:00
Christian Legnitto
1ff882743d Added tag AURORA_BASE_20110412 for changeset a95d42642281 2011-04-12 07:11:23 -07:00
Aki Sasaki
104d82fcb7 Added tag MOBILE_MERGE_DONE_20110406 for changeset a71bd564ebf5
--HG--
extra : rebase_source : 2159cadc94d6358aed42512096c171012d8864d0
2011-04-06 13:12:23 -07:00
Aki Sasaki
f14cedae09 Added tag MOBILE_MERGE_DONE for changeset a71bd564ebf5
--HG--
extra : rebase_source : 40f3eec2655423124be9b310d857122768a21224
2011-04-06 13:12:20 -07:00
Aki Sasaki
863c573ba4 Added tag PRE_MOBILE_MERGE_20110406 for changeset b70744835d94
--HG--
extra : rebase_source : 8c803be70dc59ae19cf558b5616a9b7b3df3e397
2011-04-06 13:12:02 -07:00
Aki Sasaki
ffd6338410 Added tag PRE_MOBILE_MERGE for changeset b70744835d94
--HG--
extra : rebase_source : 6cd9fd42e8062a4026bd17d80ebabe0947b59f76
2011-04-06 13:11:58 -07:00
Ben Hearsum
0719d257c8 Add GECKO_2_1_BASE tag. a=NPOTB on a CLOSED TREE 2011-03-24 09:14:33 -04:00
Ben Hearsum
f2cec00202 Add GECKO_2_0_BASE tag. a=NPOTB on a CLOSED TREE 2011-03-24 09:14:30 -04:00
Nick Thomas
5de07012e6 Create UPDATE_PACKAGING_R11_1_MU tag on 138f593553b6 for major updates to Fx4, a=beltzner NPOTB DONTBUILD 2011-03-16 11:29:19 +13:00
Ben Hearsum
e26060747c Create UPDATE_PACKAGING_R13 tag for bug 583671. r=rail. a=npotb DONTBUILD 2010-12-23 12:27:50 -05:00
Ben Hearsum
0c51883ef2 Creating UPDATE_PACKAGING_R12 (same as R11) on a CLOSED TREE. a=npotb 2010-08-23 11:31:45 -04:00
Benjamin Smedberg
4d172dd53d Merge mozilla-central, including the Electrolysis changes, into the branch for bug 568691. 2010-07-01 11:55:57 -04:00
Benjamin Smedberg
e89592ae6d Added tag bsmedberg-static-xpcom-registration-base for changeset 2f83edbbeef0 2010-06-24 12:16:59 -04:00
Benjamin Smedberg
78481b5e53 Added tag bsmedberg-static-xpcom-registration-base for changeset 0327e126ea24 2010-06-10 14:58:38 -04:00
Jason Duell
d194b9d486 Merge from m-c.
Fair amount of merge conflicts.

Biggest item was changes to nsHttpChannel from web sockets changes.

Other likely suspects if things are borken:

nsFrameLoader.cpp:
    - nsFrameLoader::EnsureMessageManager: pass "this" (orig e10s code) or
      nsnull (m-c) to local process call to new nsFrameMessageManager(),
      callback arg?  Smaug said null.
    - only calling SetCallBackData for local case.  also +r smaug.

nsPrefBranch.cpp had fairly extensive merge conflicts.

nsChromeRegistry had lots of changes.

Dougt did most of the non-necko changes (thanks).

--HG--
rename : netwerk/protocol/http/nsHttpChannel.cpp => netwerk/protocol/http/nsHttpChannelAuthProvider.cpp
rename : netwerk/protocol/http/nsHttpChannel.h => netwerk/protocol/http/nsHttpChannelAuthProvider.h
2010-06-22 17:33:57 -07:00
Doug Turner
85bd4fb391 Merge with mc 2010-03-17 10:37:32 -07:00
Ben Hearsum
c074ac65c0 Create UPDATE_PACKAGING_R10 on mozilla-central to get 3.7a* release updates working. NPOTB CLOSED TREE 2010-03-16 14:17:01 -04:00
Ben Hearsum
b361189985 Create UPDATE_PACKAGING_R9 on mozilla-central to get 3.7a* release updates working. NPOTB 2010-03-16 14:16:47 -04:00
Ben Hearsum
2c120f8161 Added tag UPDATE_PACKAGING_R11 for changeset 138f593553b6 2010-06-09 12:56:30 -04:00
Benjamin Smedberg
8b96e5d187 Added tag last-mozilla-central for changeset dba2abb7db57 2009-12-16 13:27:55 -05:00
Benjamin Smedberg
3d2fe6615e Added tag last-mozilla-central for changeset 925595f3c086 2009-12-14 21:28:07 -05:00
Benjamin Smedberg
12c0a4d675 Added tag last-mozilla-central for changeset a732c6d3c078 2009-12-14 09:20:30 -05:00