Commit Graph

56 Commits

Author SHA1 Message Date
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
Benjamin Smedberg
e659c0abda Added tag last-mozilla-central for changeset 27937722da69 2009-12-14 08:00:03 -05:00
Benjamin Smedberg
795a8c74a2 Added tag last-mozilla-central for changeset 65c1582465ef 2009-12-04 23:13:08 -05:00
Benjamin Smedberg
bf92cd73da Added tag last-mozilla-central for changeset 2bae3bbf866e 2009-11-30 13:17:34 -05:00
Benjamin Smedberg
187a34a633 Merge mozilla-central into Electrolysis 2009-08-26 12:15:27 -04:00
Benjamin Smedberg
3ca7914528 Added tag chromium-import-latest for changeset 6fd4bb500d42 2009-06-29 08:36:48 -04:00
Benjamin Smedberg
37d3bcaba4 Added tag chromium-import-r15462 for changeset 6fd4bb500d42 2009-06-29 08:36:42 -04:00
Ben Hearsum
0b01a207f9 Tagging the last common changeset of mozilla-central and mozilla-1.9.2. The tagged changeset represents the branchpoint of the two. 2009-08-13 09:53:57 -04:00
Benjamin Smedberg
ce3386b2d4 Electrolysis-plugin-only bookkeeping commit. 2009-12-15 20:33:05 -05:00
Nick Thomas
b2754c139c Create UPDATE_PACKAGING_R8 for release update generation 2009-05-29 22:36:32 +12:00
Stuart Parmenter
476d842482 Added tag FENNEC_B1 for changeset 5c1e7c779b6e 2009-03-12 13:11:30 -07:00
Brad Lassey
9fb0950de5 Added tag FENNEC_M11 for changeset f817a4378f32 2009-02-10 20:20:24 -05:00
Nick Thomas
fe3e725359 Added tag UPDATE_PACKAGING_R7 for changeset fb32f6e1859c 2009-02-02 18:14:26 +13:00
Nick Thomas
558996f20c Added tag UPDATE_PACKAGING_R7 for changeset d7d64f68423b 2009-01-29 00:03:35 +13:00
Stuart Parmenter
42e8c7084c Added tag FENNEC_A2 for changeset 8a601ed6bc4c 2008-12-22 17:18:43 -08:00
Ben Hearsum
9ac79b8f14 This tag indicates the point where http://hg.mozilla.org/releases/mozilla-1.9.1 and http://hg.mozilla.org/mozilla-central branched off from each other (update to not be on the relbranch). CLOSED TREE 2008-12-01 12:14:54 -05:00
Ben Hearsum
5731de2e16 Adding GECKO_1_9_1_BASE tag (details in full commit message).
This tag indicates the point where http://hg.mozilla.org/mozilla-central was cloned to http://hg.mozilla.org/releases/mozilla-1.9.1 for final 1.9.1/3.1 development and maintenance releases.
2008-11-19 09:01:16 -05:00
Philippe M. Chiasson
72ff54e41c cleaning up unused tags in the Thunderbird 3 Aplha 3 dry-run build 2008-10-20 12:09:47 -04:00
Ben Hearsum
f188310f0c Added tag UPDATE_PACKAGING_R6 for changeset d7d64f68423b 2008-10-17 17:11:45 -04:00
Philippe M. Chiasson
9bd9033a22 Rename tags, since we decided to make an Alpha 3, not a Beta 1 yet. 2008-10-01 16:30:15 -04:00
Ben Hearsum
68e59c7765 Added tag UPDATE_PACKAGING_R6 for changeset f197b51bbc29 2008-09-30 14:06:59 -04:00
Ben Hearsum
8dc1acb908 Removed tag Adding UPDATE_PACKAGING_R5 tag in order to make patcher work. 2008-09-30 06:44:10 -04:00
Ben Hearsum
9f49e98f11 Removed tag -m 2008-09-30 06:43:56 -04:00
Gavin Sharp
0a6011fcf2 tag mozilla-central for Thunderbird 3_0b1 2008-09-29 17:44:30 -04:00
Gavin Sharp
a805a78864 tag mozilla-central for Thunderbird 3_0b1 2008-09-29 17:44:19 -04:00
bhearsum@mozilla.com
9fa592a791 Added tag UPDATE_PACKAGING_R5, -m, Adding UPDATE_PACKAGING_R5 tag in order to make patcher work. for changeset f197b51bbc29 2008-09-29 12:10:06 -07:00
Robert Kaiser
9b1c7665db tag mozilla-central for SeaMonkey 2.0a1 release 2008-09-25 00:20:45 +02:00
Robert Kaiser
29bd2d73dc tag mozilla-central for SeaMonkey 2.0a1 build1 2008-09-25 00:20:31 +02:00
Stuart Parmenter
7b6e301716 Added tag FENNEC_M8 for changeset 269af1ed7564 2008-09-23 17:05:50 -07:00
Ben Hearsum
0f6db640cc Added tag FIREFOX_3_1a2_RELEASE for changeset f197b51bbc29 2008-08-29 09:25:45 -04:00
Ben Hearsum
9b5888b20c Added tag FIREFOX_3_1a2_BUILD1 for changeset f197b51bbc29 2008-08-29 09:25:34 -04:00
Ben Hearsum
04a9fa0dcb Added tag FIREFOX_3_1a1_BUILD2 for changeset afc4ee509d9c 2008-07-25 12:59:49 -04:00
Ben Hearsum
834238011c Added tag FIREFOX_3_1a1_RELEASE for changeset afc4ee509d9c 2008-07-25 12:59:33 -04:00
Ben Hearsum
c6e4d5a7be Added tag FIREFOX_3_1a1_RELEASE for changeset c1d7e318a275 2008-07-25 12:57:18 -04:00
Ben Hearsum
9e296d5b5a Added tag FIREFOX_3_1a1_BUILD2 for changeset c1d7e318a275 2008-07-25 12:57:09 -04:00