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

75 Коммитов

Автор SHA1 Сообщение Дата
cltbld 39aec7b4a9 Added tag FIREFOX_AURORA_13_BASE for changeset b6627f28b7ec 2012-03-13 13:33:44 -07:00
Boris Zbarsky 102f8eb5ff Added tag AURORA_BASE_20120131 for changeset bbc7014db2de 2012-02-01 12:24:29 -05:00
Alex Keybl 35becf32a9 Bug 700000 - Version bump 2012-01-31 10:57:49 -08:00
Alex Keybl dbdc714a0b Added tag AURORA_BASE_20120131 for changeset bbc7014db2de 2012-01-31 10:17:43 -08:00
Ben Hearsum efa35f490d Bug 607389 - generate partial updates at build time for releases. DONTBUILD 2012-01-24 09:18:44 -05:00
Christian Legnitto 74cfea62e3 Added tag AURORA_BASE_20111220 for changeset a8506ab2c654 2011-12-20 09:14:30 -08:00
Christian Legnitto 4cf7cad98a Added tag AURORA_BASE_20111108 for changeset 54bfd8bf682e 2011-11-08 09:06:38 -08:00
Nick Thomas 95457c4b79 Bug 682805, add tag UPDATE_PACKAGING_R15 (on R14), a=legneato DONTBUILD 2011-10-26 12:09:03 +13:00
Boris Zbarsky 18b8377ec1 Added tag AURORA_BASE_20110927 for changeset c0983049bcaa to CLOSED TREE, DONTBUILD 2011-09-27 13:09:13 -04:00
Ehsan Akhgari 7ca9308af1 Added tag AURORA_BASE_20110816 for changeset 41b84b87c816 on a CLOSED TREE DONTBUILD 2011-08-16 14:13:48 -04:00
Boris Zbarsky 0d741f721e Added tag AURORA_BASE_20110705 for changeset 5eb553dd2cea 2011-07-05 12:54:15 -04:00
Ben Hearsum b103b71453 Move UPDATE_PACKAGING_R14 tag to pick up bug 658094. DONTBUILD 2011-05-26 19:51:50 -04:00
Ehsan Akhgari 34005a1aa5 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 ad55304ce8 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 39dd399547 Added tag AURORA_BASE_20110412 for changeset a95d42642281 2011-04-12 07:11:23 -07:00
Aki Sasaki 458f922704 Added tag MOBILE_MERGE_DONE_20110406 for changeset a71bd564ebf5
--HG--
extra : rebase_source : 2159cadc94d6358aed42512096c171012d8864d0
2011-04-06 13:12:23 -07:00
Aki Sasaki 40abf7d22b Added tag MOBILE_MERGE_DONE for changeset a71bd564ebf5
--HG--
extra : rebase_source : 40f3eec2655423124be9b310d857122768a21224
2011-04-06 13:12:20 -07:00
Aki Sasaki c877f3b8b4 Added tag PRE_MOBILE_MERGE_20110406 for changeset b70744835d94
--HG--
extra : rebase_source : 8c803be70dc59ae19cf558b5616a9b7b3df3e397
2011-04-06 13:12:02 -07:00
Aki Sasaki b60fc7ae3a Added tag PRE_MOBILE_MERGE for changeset b70744835d94
--HG--
extra : rebase_source : 6cd9fd42e8062a4026bd17d80ebabe0947b59f76
2011-04-06 13:11:58 -07:00
Ben Hearsum eaa84908f2 Add GECKO_2_1_BASE tag. a=NPOTB on a CLOSED TREE 2011-03-24 09:14:33 -04:00
Ben Hearsum cb1f092578 Add GECKO_2_0_BASE tag. a=NPOTB on a CLOSED TREE 2011-03-24 09:14:30 -04:00
Nick Thomas 1b131060c3 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 b4a0160286 Create UPDATE_PACKAGING_R13 tag for bug 583671. r=rail. a=npotb DONTBUILD 2010-12-23 12:27:50 -05:00
Ben Hearsum 2acb27bfe5 Creating UPDATE_PACKAGING_R12 (same as R11) on a CLOSED TREE. a=npotb 2010-08-23 11:31:45 -04:00
Benjamin Smedberg dfed11844b Merge mozilla-central, including the Electrolysis changes, into the branch for bug 568691. 2010-07-01 11:55:57 -04:00
Benjamin Smedberg c335a47158 Added tag bsmedberg-static-xpcom-registration-base for changeset 2f83edbbeef0 2010-06-24 12:16:59 -04:00
Benjamin Smedberg f57d86b249 Added tag bsmedberg-static-xpcom-registration-base for changeset 0327e126ea24 2010-06-10 14:58:38 -04:00
Jason Duell 549ae22a9e 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 f4215966ff Merge with mc 2010-03-17 10:37:32 -07:00
Ben Hearsum 4da58f0334 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 30227e84b1 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 fc4b6869b4 Added tag UPDATE_PACKAGING_R11 for changeset 138f593553b6 2010-06-09 12:56:30 -04:00
Benjamin Smedberg f2d1f699b1 Added tag last-mozilla-central for changeset dba2abb7db57 2009-12-16 13:27:55 -05:00
Benjamin Smedberg f867723510 Added tag last-mozilla-central for changeset 925595f3c086 2009-12-14 21:28:07 -05:00
Benjamin Smedberg 096564244a Added tag last-mozilla-central for changeset a732c6d3c078 2009-12-14 09:20:30 -05:00
Benjamin Smedberg 537f530ed8 Added tag last-mozilla-central for changeset 27937722da69 2009-12-14 08:00:03 -05:00
Benjamin Smedberg c0e2cfedbf Added tag last-mozilla-central for changeset 65c1582465ef 2009-12-04 23:13:08 -05:00
Benjamin Smedberg a82b78a0df Added tag last-mozilla-central for changeset 2bae3bbf866e 2009-11-30 13:17:34 -05:00
Benjamin Smedberg 8f00e422eb Merge mozilla-central into Electrolysis 2009-08-26 12:15:27 -04:00
Benjamin Smedberg b51fd93790 Added tag chromium-import-latest for changeset 6fd4bb500d42 2009-06-29 08:36:48 -04:00
Benjamin Smedberg a6499bab25 Added tag chromium-import-r15462 for changeset 6fd4bb500d42 2009-06-29 08:36:42 -04:00
Ben Hearsum 0c3281f56b 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 ee63070241 Electrolysis-plugin-only bookkeeping commit. 2009-12-15 20:33:05 -05:00
Nick Thomas aa47921945 Create UPDATE_PACKAGING_R8 for release update generation 2009-05-29 22:36:32 +12:00
Stuart Parmenter 5d4e553031 Added tag FENNEC_B1 for changeset 5c1e7c779b6e 2009-03-12 13:11:30 -07:00
Brad Lassey fd8b62d3b3 Added tag FENNEC_M11 for changeset f817a4378f32 2009-02-10 20:20:24 -05:00
Nick Thomas b6fece779f Added tag UPDATE_PACKAGING_R7 for changeset fb32f6e1859c 2009-02-02 18:14:26 +13:00
Nick Thomas 2aa10485f1 Added tag UPDATE_PACKAGING_R7 for changeset d7d64f68423b 2009-01-29 00:03:35 +13:00
Stuart Parmenter 8ae8aaf058 Added tag FENNEC_A2 for changeset 8a601ed6bc4c 2008-12-22 17:18:43 -08:00
Ben Hearsum 8002eb550d 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