Граф коммитов

52 Коммитов

Автор SHA1 Сообщение Дата
Ben Hearsum 35df7515b1 Creating UPDATE_PACKAGING_R12 (same as R11) on a CLOSED TREE. a=npotb 2010-08-23 11:31:45 -04:00
Benjamin Smedberg a677e5bf91 Merge mozilla-central, including the Electrolysis changes, into the branch for bug 568691. 2010-07-01 11:55:57 -04:00
Benjamin Smedberg c70b7f03ef Added tag bsmedberg-static-xpcom-registration-base for changeset 2f83edbbeef0 2010-06-24 12:16:59 -04:00
Benjamin Smedberg c632f33ec4 Added tag bsmedberg-static-xpcom-registration-base for changeset 0327e126ea24 2010-06-10 14:58:38 -04:00
Jason Duell 386a098a89 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 ef54d33b11 Merge with mc 2010-03-17 10:37:32 -07:00
Ben Hearsum 6967dc4528 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 0a8a718602 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 bd0a42505b Added tag UPDATE_PACKAGING_R11 for changeset 138f593553b6 2010-06-09 12:56:30 -04:00
Benjamin Smedberg a27de39138 Added tag last-mozilla-central for changeset dba2abb7db57 2009-12-16 13:27:55 -05:00
Benjamin Smedberg 11faf67230 Added tag last-mozilla-central for changeset 925595f3c086 2009-12-14 21:28:07 -05:00
Benjamin Smedberg 6e9572ef75 Added tag last-mozilla-central for changeset a732c6d3c078 2009-12-14 09:20:30 -05:00
Benjamin Smedberg 27313d109b Added tag last-mozilla-central for changeset 27937722da69 2009-12-14 08:00:03 -05:00
Benjamin Smedberg 3abb12e6ef Added tag last-mozilla-central for changeset 65c1582465ef 2009-12-04 23:13:08 -05:00
Benjamin Smedberg e24dbe141e Added tag last-mozilla-central for changeset 2bae3bbf866e 2009-11-30 13:17:34 -05:00
Benjamin Smedberg 689058eecc Merge mozilla-central into Electrolysis 2009-08-26 12:15:27 -04:00
Benjamin Smedberg 7712c35e62 Added tag chromium-import-latest for changeset 6fd4bb500d42 2009-06-29 08:36:48 -04:00
Benjamin Smedberg 09a3f2fa17 Added tag chromium-import-r15462 for changeset 6fd4bb500d42 2009-06-29 08:36:42 -04:00
Ben Hearsum daae350c5f 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 c827f3a584 Electrolysis-plugin-only bookkeeping commit. 2009-12-15 20:33:05 -05:00
Nick Thomas b30e9e9ce7 Create UPDATE_PACKAGING_R8 for release update generation 2009-05-29 22:36:32 +12:00
Stuart Parmenter baae423474 Added tag FENNEC_B1 for changeset 5c1e7c779b6e 2009-03-12 13:11:30 -07:00
Brad Lassey a315c70816 Added tag FENNEC_M11 for changeset f817a4378f32 2009-02-10 20:20:24 -05:00
Nick Thomas 02f02434de Added tag UPDATE_PACKAGING_R7 for changeset fb32f6e1859c 2009-02-02 18:14:26 +13:00
Nick Thomas 5cf51da663 Added tag UPDATE_PACKAGING_R7 for changeset d7d64f68423b 2009-01-29 00:03:35 +13:00
Stuart Parmenter 1b08f39c3e Added tag FENNEC_A2 for changeset 8a601ed6bc4c 2008-12-22 17:18:43 -08:00
Ben Hearsum 37f317d0f1 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 f18f2bb6b3 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 2ffaaab36b cleaning up unused tags in the Thunderbird 3 Aplha 3 dry-run build 2008-10-20 12:09:47 -04:00
Ben Hearsum 1382a3e616 Added tag UPDATE_PACKAGING_R6 for changeset d7d64f68423b 2008-10-17 17:11:45 -04:00
Philippe M. Chiasson 3f3ef568a2 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 ba84c48dba Added tag UPDATE_PACKAGING_R6 for changeset f197b51bbc29 2008-09-30 14:06:59 -04:00
Ben Hearsum cc1434d1c3 Removed tag Adding UPDATE_PACKAGING_R5 tag in order to make patcher work. 2008-09-30 06:44:10 -04:00
Ben Hearsum f3e0849cb2 Removed tag -m 2008-09-30 06:43:56 -04:00
Gavin Sharp 72087e2a02 tag mozilla-central for Thunderbird 3_0b1 2008-09-29 17:44:30 -04:00
Gavin Sharp 2cf67e83f1 tag mozilla-central for Thunderbird 3_0b1 2008-09-29 17:44:19 -04:00
bhearsum@mozilla.com 34298541ef 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 5a2691faf5 tag mozilla-central for SeaMonkey 2.0a1 release 2008-09-25 00:20:45 +02:00
Robert Kaiser c3db1388c1 tag mozilla-central for SeaMonkey 2.0a1 build1 2008-09-25 00:20:31 +02:00
Stuart Parmenter 21c9167e4e Added tag FENNEC_M8 for changeset 269af1ed7564 2008-09-23 17:05:50 -07:00
Ben Hearsum 26af9b1a8b Added tag FIREFOX_3_1a2_RELEASE for changeset f197b51bbc29 2008-08-29 09:25:45 -04:00
Ben Hearsum 3235ee33e3 Added tag FIREFOX_3_1a2_BUILD1 for changeset f197b51bbc29 2008-08-29 09:25:34 -04:00
Ben Hearsum 0bb63aeb51 Added tag FIREFOX_3_1a1_BUILD2 for changeset afc4ee509d9c 2008-07-25 12:59:49 -04:00
Ben Hearsum 42806da2e8 Added tag FIREFOX_3_1a1_RELEASE for changeset afc4ee509d9c 2008-07-25 12:59:33 -04:00
Ben Hearsum bf94eedb30 Added tag FIREFOX_3_1a1_RELEASE for changeset c1d7e318a275 2008-07-25 12:57:18 -04:00
Ben Hearsum 81167dd85f Added tag FIREFOX_3_1a1_BUILD2 for changeset c1d7e318a275 2008-07-25 12:57:09 -04:00
Ben Hearsum f9871116d2 Added tag FIREFOX_3_1a1_BUILD1 for changeset 9d9941eacb14 2008-07-23 09:13:57 -04:00
Ben Hearsum 1d40f98fcc Added tag FIREFOX_3_1a1_RELEASE for changeset 9d9941eacb14 2008-07-23 09:13:49 -04:00
Brad Lassey aa7966939c Added tag FENNEC_M4 for changeset caeba7562e49 2008-06-26 17:34:05 -04:00
jst@mozilla.com c89bd91b8d Added tag MOZILLA_1_9_a7_BASE for changeset 66a5c7bce7ee 2007-08-06 15:30:41 -07:00