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

2646 Коммитов

Автор SHA1 Сообщение Дата
Rafael Ávila de Espíndola 1a88fa5343 Bug 696281 - disable trace malloc stacks on OS X too. r=dbaron.
This patch disables trace malloc stacks on OS X too. To make this work,
we still have to look on the stack to decide if we must set immediate_abort,
but we can avoid other work like decoding the addresses.
2011-10-28 18:43:49 -04:00
Benoit Girard 26931ef829 Bug 683229 - Add user space profiling using Simple Profiler System (SPS). r=cjones r=jmuizelaar
--HG--
extra : rebase_source : 2482a65256588b88663e8f0ab621b9787bbe5489
2011-08-26 17:05:37 -07:00
Bobby Holley 4056145565 Bug 584894 - Move libpng to media/libpng. r=khuey
--HG--
rename : modules/libimg/png/CHANGES => media/libpng/CHANGES
rename : modules/libimg/png/LICENSE => media/libpng/LICENSE
rename : modules/libimg/png/MOZCHANGES => media/libpng/MOZCHANGES
rename : modules/libimg/png/Makefile.in => media/libpng/Makefile.in
rename : modules/libimg/png/README => media/libpng/README
rename : modules/libimg/png/crashtests/374810-1.html => media/libpng/crashtests/374810-1.html
rename : modules/libimg/png/crashtests/crashtests.list => media/libpng/crashtests/crashtests.list
rename : modules/libimg/png/libpng.txt => media/libpng/libpng.txt
rename : modules/libimg/png/mozpngconf.h => media/libpng/mozpngconf.h
rename : modules/libimg/png/png.c => media/libpng/png.c
rename : modules/libimg/png/png.h => media/libpng/png.h
rename : modules/libimg/png/pngconf.h => media/libpng/pngconf.h
rename : modules/libimg/png/pngerror.c => media/libpng/pngerror.c
rename : modules/libimg/png/pngget.c => media/libpng/pngget.c
rename : modules/libimg/png/pngmem.c => media/libpng/pngmem.c
rename : modules/libimg/png/pngpread.c => media/libpng/pngpread.c
rename : modules/libimg/png/pngpriv.h => media/libpng/pngpriv.h
rename : modules/libimg/png/pngread.c => media/libpng/pngread.c
rename : modules/libimg/png/pngrio.c => media/libpng/pngrio.c
rename : modules/libimg/png/pngrtran.c => media/libpng/pngrtran.c
rename : modules/libimg/png/pngrutil.c => media/libpng/pngrutil.c
rename : modules/libimg/png/pngset.c => media/libpng/pngset.c
rename : modules/libimg/png/pngtrans.c => media/libpng/pngtrans.c
rename : modules/libimg/png/pngwio.c => media/libpng/pngwio.c
rename : modules/libimg/png/pngwrite.c => media/libpng/pngwrite.c
rename : modules/libimg/png/pngwtran.c => media/libpng/pngwtran.c
rename : modules/libimg/png/pngwutil.c => media/libpng/pngwutil.c
2011-10-17 21:25:53 -07:00
Bobby Holley 2d0b90011e Bug 584894 - Move libjpeg to media/libjpeg. r=khuey
--HG--
rename : jpeg/MOZCHANGES => media/libjpeg/MOZCHANGES
rename : jpeg/Makefile.in => media/libjpeg/Makefile.in
rename : jpeg/README => media/libjpeg/README
rename : jpeg/README-turbo.txt => media/libjpeg/README-turbo.txt
rename : jpeg/cderror.h => media/libjpeg/cderror.h
rename : jpeg/cdjpeg.h => media/libjpeg/cdjpeg.h
rename : jpeg/jaricom.c => media/libjpeg/jaricom.c
rename : jpeg/jcapimin.c => media/libjpeg/jcapimin.c
rename : jpeg/jcapistd.c => media/libjpeg/jcapistd.c
rename : jpeg/jcarith.c => media/libjpeg/jcarith.c
rename : jpeg/jccoefct.c => media/libjpeg/jccoefct.c
rename : jpeg/jccolor.c => media/libjpeg/jccolor.c
rename : jpeg/jcdctmgr.c => media/libjpeg/jcdctmgr.c
rename : jpeg/jchuff.c => media/libjpeg/jchuff.c
rename : jpeg/jchuff.h => media/libjpeg/jchuff.h
rename : jpeg/jcinit.c => media/libjpeg/jcinit.c
rename : jpeg/jcmainct.c => media/libjpeg/jcmainct.c
rename : jpeg/jcmarker.c => media/libjpeg/jcmarker.c
rename : jpeg/jcmaster.c => media/libjpeg/jcmaster.c
rename : jpeg/jcomapi.c => media/libjpeg/jcomapi.c
rename : jpeg/jconfig.h => media/libjpeg/jconfig.h
rename : jpeg/jconfig.h.in => media/libjpeg/jconfig.h.in
rename : jpeg/jcparam.c => media/libjpeg/jcparam.c
rename : jpeg/jcphuff.c => media/libjpeg/jcphuff.c
rename : jpeg/jcprepct.c => media/libjpeg/jcprepct.c
rename : jpeg/jcsample.c => media/libjpeg/jcsample.c
rename : jpeg/jdapimin.c => media/libjpeg/jdapimin.c
rename : jpeg/jdapistd.c => media/libjpeg/jdapistd.c
rename : jpeg/jdarith.c => media/libjpeg/jdarith.c
rename : jpeg/jdatadst.c => media/libjpeg/jdatadst.c
rename : jpeg/jdatasrc.c => media/libjpeg/jdatasrc.c
rename : jpeg/jdcoefct.c => media/libjpeg/jdcoefct.c
rename : jpeg/jdcolor.c => media/libjpeg/jdcolor.c
rename : jpeg/jdct.h => media/libjpeg/jdct.h
rename : jpeg/jddctmgr.c => media/libjpeg/jddctmgr.c
rename : jpeg/jdhuff.c => media/libjpeg/jdhuff.c
rename : jpeg/jdhuff.h => media/libjpeg/jdhuff.h
rename : jpeg/jdinput.c => media/libjpeg/jdinput.c
rename : jpeg/jdmainct.c => media/libjpeg/jdmainct.c
rename : jpeg/jdmarker.c => media/libjpeg/jdmarker.c
rename : jpeg/jdmaster.c => media/libjpeg/jdmaster.c
rename : jpeg/jdmerge.c => media/libjpeg/jdmerge.c
rename : jpeg/jdphuff.c => media/libjpeg/jdphuff.c
rename : jpeg/jdpostct.c => media/libjpeg/jdpostct.c
rename : jpeg/jdsample.c => media/libjpeg/jdsample.c
rename : jpeg/jdtrans.c => media/libjpeg/jdtrans.c
rename : jpeg/jerror.c => media/libjpeg/jerror.c
rename : jpeg/jerror.h => media/libjpeg/jerror.h
rename : jpeg/jfdctflt.c => media/libjpeg/jfdctflt.c
rename : jpeg/jfdctfst.c => media/libjpeg/jfdctfst.c
rename : jpeg/jfdctint.c => media/libjpeg/jfdctint.c
rename : jpeg/jidctflt.c => media/libjpeg/jidctflt.c
rename : jpeg/jidctfst.c => media/libjpeg/jidctfst.c
rename : jpeg/jidctint.c => media/libjpeg/jidctint.c
rename : jpeg/jidctred.c => media/libjpeg/jidctred.c
rename : jpeg/jinclude.h => media/libjpeg/jinclude.h
rename : jpeg/jmemmgr.c => media/libjpeg/jmemmgr.c
rename : jpeg/jmemnobs.c => media/libjpeg/jmemnobs.c
rename : jpeg/jmemsys.h => media/libjpeg/jmemsys.h
rename : jpeg/jmorecfg.h => media/libjpeg/jmorecfg.h
rename : jpeg/jpegcomp.h => media/libjpeg/jpegcomp.h
rename : jpeg/jpegint.h => media/libjpeg/jpegint.h
rename : jpeg/jpeglib.h => media/libjpeg/jpeglib.h
rename : jpeg/jquant1.c => media/libjpeg/jquant1.c
rename : jpeg/jquant2.c => media/libjpeg/jquant2.c
rename : jpeg/jsimd.h => media/libjpeg/jsimd.h
rename : jpeg/jsimd_none.c => media/libjpeg/jsimd_none.c
rename : jpeg/jsimddct.h => media/libjpeg/jsimddct.h
rename : jpeg/jutils.c => media/libjpeg/jutils.c
rename : jpeg/jversion.h => media/libjpeg/jversion.h
rename : jpeg/simd/Makefile.in => media/libjpeg/simd/Makefile.in
rename : jpeg/simd/jcclrmmx.asm => media/libjpeg/simd/jcclrmmx.asm
rename : jpeg/simd/jcclrss2-64.asm => media/libjpeg/simd/jcclrss2-64.asm
rename : jpeg/simd/jcclrss2.asm => media/libjpeg/simd/jcclrss2.asm
rename : jpeg/simd/jccolmmx.asm => media/libjpeg/simd/jccolmmx.asm
rename : jpeg/simd/jccolss2-64.asm => media/libjpeg/simd/jccolss2-64.asm
rename : jpeg/simd/jccolss2.asm => media/libjpeg/simd/jccolss2.asm
rename : jpeg/simd/jcolsamp.inc => media/libjpeg/simd/jcolsamp.inc
rename : jpeg/simd/jcqnt3dn.asm => media/libjpeg/simd/jcqnt3dn.asm
rename : jpeg/simd/jcqntmmx.asm => media/libjpeg/simd/jcqntmmx.asm
rename : jpeg/simd/jcqnts2f-64.asm => media/libjpeg/simd/jcqnts2f-64.asm
rename : jpeg/simd/jcqnts2f.asm => media/libjpeg/simd/jcqnts2f.asm
rename : jpeg/simd/jcqnts2i-64.asm => media/libjpeg/simd/jcqnts2i-64.asm
rename : jpeg/simd/jcqnts2i.asm => media/libjpeg/simd/jcqnts2i.asm
rename : jpeg/simd/jcqntsse.asm => media/libjpeg/simd/jcqntsse.asm
rename : jpeg/simd/jcsammmx.asm => media/libjpeg/simd/jcsammmx.asm
rename : jpeg/simd/jcsamss2-64.asm => media/libjpeg/simd/jcsamss2-64.asm
rename : jpeg/simd/jcsamss2.asm => media/libjpeg/simd/jcsamss2.asm
rename : jpeg/simd/jdclrmmx.asm => media/libjpeg/simd/jdclrmmx.asm
rename : jpeg/simd/jdclrss2-64.asm => media/libjpeg/simd/jdclrss2-64.asm
rename : jpeg/simd/jdclrss2.asm => media/libjpeg/simd/jdclrss2.asm
rename : jpeg/simd/jdcolmmx.asm => media/libjpeg/simd/jdcolmmx.asm
rename : jpeg/simd/jdcolss2-64.asm => media/libjpeg/simd/jdcolss2-64.asm
rename : jpeg/simd/jdcolss2.asm => media/libjpeg/simd/jdcolss2.asm
rename : jpeg/simd/jdct.inc => media/libjpeg/simd/jdct.inc
rename : jpeg/simd/jdmermmx.asm => media/libjpeg/simd/jdmermmx.asm
rename : jpeg/simd/jdmerss2-64.asm => media/libjpeg/simd/jdmerss2-64.asm
rename : jpeg/simd/jdmerss2.asm => media/libjpeg/simd/jdmerss2.asm
rename : jpeg/simd/jdmrgmmx.asm => media/libjpeg/simd/jdmrgmmx.asm
rename : jpeg/simd/jdmrgss2-64.asm => media/libjpeg/simd/jdmrgss2-64.asm
rename : jpeg/simd/jdmrgss2.asm => media/libjpeg/simd/jdmrgss2.asm
rename : jpeg/simd/jdsammmx.asm => media/libjpeg/simd/jdsammmx.asm
rename : jpeg/simd/jdsamss2-64.asm => media/libjpeg/simd/jdsamss2-64.asm
rename : jpeg/simd/jdsamss2.asm => media/libjpeg/simd/jdsamss2.asm
rename : jpeg/simd/jf3dnflt.asm => media/libjpeg/simd/jf3dnflt.asm
rename : jpeg/simd/jfmmxfst.asm => media/libjpeg/simd/jfmmxfst.asm
rename : jpeg/simd/jfmmxint.asm => media/libjpeg/simd/jfmmxint.asm
rename : jpeg/simd/jfss2fst-64.asm => media/libjpeg/simd/jfss2fst-64.asm
rename : jpeg/simd/jfss2fst.asm => media/libjpeg/simd/jfss2fst.asm
rename : jpeg/simd/jfss2int-64.asm => media/libjpeg/simd/jfss2int-64.asm
rename : jpeg/simd/jfss2int.asm => media/libjpeg/simd/jfss2int.asm
rename : jpeg/simd/jfsseflt-64.asm => media/libjpeg/simd/jfsseflt-64.asm
rename : jpeg/simd/jfsseflt.asm => media/libjpeg/simd/jfsseflt.asm
rename : jpeg/simd/ji3dnflt.asm => media/libjpeg/simd/ji3dnflt.asm
rename : jpeg/simd/jimmxfst.asm => media/libjpeg/simd/jimmxfst.asm
rename : jpeg/simd/jimmxint.asm => media/libjpeg/simd/jimmxint.asm
rename : jpeg/simd/jimmxred.asm => media/libjpeg/simd/jimmxred.asm
rename : jpeg/simd/jiss2flt-64.asm => media/libjpeg/simd/jiss2flt-64.asm
rename : jpeg/simd/jiss2flt.asm => media/libjpeg/simd/jiss2flt.asm
rename : jpeg/simd/jiss2fst-64.asm => media/libjpeg/simd/jiss2fst-64.asm
rename : jpeg/simd/jiss2fst.asm => media/libjpeg/simd/jiss2fst.asm
rename : jpeg/simd/jiss2int-64.asm => media/libjpeg/simd/jiss2int-64.asm
rename : jpeg/simd/jiss2int.asm => media/libjpeg/simd/jiss2int.asm
rename : jpeg/simd/jiss2red-64.asm => media/libjpeg/simd/jiss2red-64.asm
rename : jpeg/simd/jiss2red.asm => media/libjpeg/simd/jiss2red.asm
rename : jpeg/simd/jisseflt.asm => media/libjpeg/simd/jisseflt.asm
rename : jpeg/simd/jsimd.h => media/libjpeg/simd/jsimd.h
rename : jpeg/simd/jsimd_i386.c => media/libjpeg/simd/jsimd_i386.c
rename : jpeg/simd/jsimd_x86_64.c => media/libjpeg/simd/jsimd_x86_64.c
rename : jpeg/simd/jsimdcfg.inc => media/libjpeg/simd/jsimdcfg.inc
rename : jpeg/simd/jsimdcfg.inc.h => media/libjpeg/simd/jsimdcfg.inc.h
rename : jpeg/simd/jsimdcpu.asm => media/libjpeg/simd/jsimdcpu.asm
rename : jpeg/simd/jsimdext.inc => media/libjpeg/simd/jsimdext.inc
rename : jpeg/transupp.h => media/libjpeg/transupp.h
2011-10-17 21:25:53 -07:00
Ehsan Akhgari 92064e6d3f Bug 690892 - Replace PR_TRUE/PR_FALSE with true/false on mozilla-central; rs=dbaron
Landing on a CLOSED TREE
2011-10-17 10:59:28 -04:00
Randell Jesup 49fba95a20 bug 691245: Fix jprof under Fedora 15 (needs -ldl) r=dbaron 2011-10-05 09:20:20 -04:00
Michael Wu d2b70213ac Bug 675553 - Switch from PRBool to bool on a CLOSED TREE , r=bsmedberg,khuey,bz,cjones
--HG--
rename : tools/trace-malloc/bloatblame.c => tools/trace-malloc/bloatblame.cpp
2011-09-28 23:19:26 -07:00
Randell Jesup 56633f7da8 Bug 674384: jprof - better thread support, support e10s profiling and profile-by-capture-section. r=dbaron DONTBUILD 2011-08-12 11:59:20 -04:00
Randell Jesup 57c575c552 Bug 664453: Stop jprof from crashing before a profile is selected on JP_START. r=dbaron DONTBUILD 2011-08-12 11:59:17 -04:00
Michael Wu f6e7ea13ac Bug 675485 - Fix PRBool misuses found in a debug build, r=bz,taras 2011-08-01 18:20:52 -07:00
Matheus Kerschbaum b0c1f89ef4 Bug 579571 - Remove --enable-timeline support. r=tglek 2011-07-17 12:07:42 +02:00
Ted Mielczarek 4333f51ea5 bug 659950 - implement a much simpler pair of codesize metrics: on-disk application size + installer size. r=glandium
--HG--
extra : rebase_source : 6ac0f4c367e7941de3dbbd05234afdb4e79ab14c
2011-06-28 07:55:56 -04:00
Randell Jesup 40c1a04059 Bug 666501: fix jprof to work in builds without run-mozilla.sh r=glandium 2011-06-24 00:01:49 -04:00
Mike Hommey b7ab8c2806 Bug 658995 part 2 - Use static destructors instead of atexit(). r=bsmedberg 2011-06-15 07:32:03 +02:00
Matt Brubeck e3a9a86a79 Back out 6b23b52e68d6 - e92f98e8a335 (bug 632404, 552864, 658995) because of Tp4 regression. 2011-06-15 09:00:28 -07:00
Mike Hommey 228b060c2b Bug 658995 part 2 - Use static destructors instead of atexit(). r=bsmedberg 2011-06-15 07:32:03 +02:00
Ted Mielczarek b9712b1eab merge m-c and b-s 2011-06-13 09:09:43 -04:00
Ed Morley 8aaddd0334 Bug 659621 - Remove EXTRA_DSO_LIBS, EXTRA_DSO_LDOPTS, OS_LIBS from makefiles containing LIBXUL_LIBRARY = 1, now that libxul is always built; r=ted 2011-06-12 03:49:00 -04:00
Phil Ringnalda 7e42e77dc9 Bug 663674 - Remove cross-commit, r=ted 2011-06-11 22:14:19 -07:00
Kyle Huey 354258d150 Bug 662403: Fix reftest-analyzer and leak-gauge to not use removed nsIDOMFile methods. r=bz
DONTBUILD
2011-06-07 10:03:02 -07:00
Randell Jesup 4abe6bb62e Bug 660968: enabling jprof doesn't make it build the shared library anymore. r=khuey 2011-06-01 03:51:03 -04:00
Matheus Kerschbaum 6eb93f7dd3 Bug 648911 - Remove support for non-libxul builds. r=ted,joedrew 2011-05-23 18:54:47 +02:00
Robert Strong 648d8cb446 Bug 658094 - Partial updates for 5.0b1 on Mac fail. r=nrthomas 2011-05-19 10:04:06 -07:00
Randell Jesup 0c31687332 Bug 653311 - Switch jprof from hand-rolled stackwalk code to glibc's backtrace() to work with modern x86 Linuxes, improve jprof output, update README - r=jim_nance (per bz) 2011-05-15 05:47:48 -04:00
Karl Tomlinson b01fb5db2e b=647469 continue after crashes in addr2line r=dbaron
--HG--
extra : transplant_source : %3B%3D%1AX%09%D6N%5D%A2%3D%1F%23%2C%408%F7P%B46S
2011-05-02 08:33:16 +12:00
L. David Baron db741ac71c Make leaksoup not print static ctor/dtor warnings. 2011-04-22 18:36:23 -07:00
Jan Küchler c510bc3046 Bug 266236 part 3: Mechanical rename of nsIRenderingContext and nsThebesRenderingContext to nsRenderingContext. Mechanical substitution of nsRefPtr<nsRenderingContext> for nsCOMPtr<nsRenderingContext>.
--HG--
rename : gfx/src/nsThebesRenderingContext.cpp => gfx/src/nsRenderingContext.cpp
extra : rebase_source : 34884bfcafd885feaf73300bc7246cd192062a48
2011-04-07 18:04:40 -07:00
Mike Hommey 2e34091c98 Bug 602245 - Don't build SIMPLE_PROGRAMS during MOZ_PROFILE_GENERATE pass. r=ted 2011-04-14 11:23:13 +02:00
Robert Strong 522b72792b 1. mar packaging and build changes - Bug 386760 - directory removal with software update. r=nthomas, r=khuey 2011-04-11 21:23:18 -07:00
Rail Aliiev 10de29569e bug 313956: expand installer .exe contents to make complete mar. r=ted 2011-04-11 12:23:26 -04:00
Chris Jones ext:(%20and%20Kyle%20Huey%20%3Ckhuey%40kylehuey.com%3E) 2c92e3ecd5 Rollup of bug 645263 and bug 646259: Switch to mozilla:: sync primitives. r=cjones,dbaron,doublec,ehsan src=bsmedberg
Bug 645263, part 0: Count sync primitive ctor/dtors. r=dbaron
Bug 645263, part 1: Migrate content/media to mozilla:: sync primitives. r=doublec
Bug 645263, part 2: Migrate modules/plugin to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 3: Migrate nsComponentManagerImpl to mozilla:: sync primitives. sr=bsmedberg
Bug 645263, part 4: Migrate everything else to mozilla:: sync primitives. r=dbaron
Bug 645263, part 5: Remove nsAutoLock.*. sr=bsmedberg
Bug 645263, part 6: Make editor test be nicer to deadlock detector. r=ehsan
Bug 645263, part 7: Disable tracemalloc backtraces for xpcshell tests. r=dbaron
Bug 646259: Fix nsCacheService to use a CondVar for notifying. r=cjones
2011-03-31 23:29:02 -05:00
Chris Jones 9ac2f0b7d8 Backed out changeset f4da8c0c48d9 for breaking nightly repacks (see bug 313956) 2011-03-31 21:32:35 -05:00
Rail Aliiev 808a0fbbce bug 313956: expand installer .exe contents to make complete mar. r=ted.
--HG--
extra : rebase_source : 1a23afed1769531afe0b2f7d307fe5709eeed99b
2011-03-29 15:04:02 -04:00
Ben Hearsum 3ccdc55c73 No-op comment change to trigger Talos after talos.zip update. r=NPOTB a=NPOTB 2011-03-03 14:09:19 -05:00
Gervase Markham 394e677d37 Merge checkin. 2011-01-27 14:48:07 +00:00
Gervase Markham 930007be79 Updates for latest run. 2011-01-27 14:45:33 +00:00
Gervase Markham 1053446f42 Removing relic test files - they create false positives in MXR, and this test stuff hasn't been used for years anyway. a=NPOTB. 2010-11-23 14:52:53 +00:00
Neil Rashbrook 59075a58ed Bug 616810 Remove extraneous CRs r=khuey a=bsmedberg 2011-01-05 23:46:04 +00:00
Shawn Wilsher 8ac1eb1dc7 Merging mozilla-central to Places. 2010-10-29 11:39:41 -07:00
Gervase Markham 2503058f0c relic master copy is now defined as the one in Hg rather than CVS. Copy
ing over all the changes from CVS since Hg branched off. a=NPOTB.
2010-10-28 12:51:06 +01:00
Chris Cooper 81af2afe89 Bug 327076 - Remove the unused unwrap shell script - r=nthomas, a=NPOTB 2010-10-14 12:46:54 -04:00
Nick Thomas ffe54290b0 bug 600098: update access and modification time on top-level application bundle on Mac OS X after successful update. r=bhearsum, a=blocking-beta-7 2010-10-01 12:33:47 -04:00
L. David Baron 66ddae3bca Initialize the out param from backtrace(). (Bug 549561) r=bsmedberg a2.0=tests 2010-09-21 19:32:48 -07:00
Doug Turner 6b84f732fb Backing out 2b912044dfe7. Bug 591866 - Temporary hack to add channel-prefs.js back to nightlies. a=me 2010-09-07 12:24:17 -07:00
Phil Ringnalda b363655d87 Bug 591717 - Remove most of tools/performance/startup, r=dbaron, a=NPOTB
--HG--
extra : rebase_source : cd49a675fb1bac30d6ce809bb1688eaf00a08bee
2010-08-29 18:21:12 -07:00
Phil Ringnalda 27222ccb87 Bug 591714 - Remove ancient (and ifdeffed out) heapdump code, r=robarnold,dbaron, a=NPOTB
--HG--
extra : rebase_source : 3aed6d6f6bf57f848cce51e59dbd13a3df590faf
2010-08-29 18:21:12 -07:00
Phil Ringnalda 33464076d6 Bug 591727 - Remove remnant makefile.win in trace-malloc, r=dbaron, a=NPOTB
--HG--
extra : rebase_source : 1643431d84ab0e255315b261a1f0bcd86dbfaa42
2010-08-29 18:21:12 -07:00
Michael Wu 6912e389ff Bug 592127 - Temporary hack to add channel-prefs.js back to nightlies, r=nthomas a=beltzner 2010-08-30 19:48:29 -07:00
Kyle Huey e0cc9b4313 Backed out changeset 6476d13bec49 2010-08-31 08:14:55 -04:00
Michael Wu 6bb1b5d4f8 Bug 592127 - Temporary hack to add channel-prefs.js back to nightlies, r=nthomas a=beltzner
--HG--
extra : rebase_source : 38f4b69ce7f39b9c94cb646c899db60171559c23
2010-08-30 19:48:29 -07:00