Ehsan Akhgari
|
2bee451447
|
Back out bug 606574 for leaking a Mutex and a CondVar in crashtests
|
2011-04-13 14:08:43 -04:00 |
|
Ted Mielczarek
|
acb51920eb
|
bug 606574 - Implement event loop instrumentation using native events, core implementation + GTK2 implementation. r=karlt,cjones
|
2011-03-03 11:20:02 -05:00 |
|
L. David Baron
|
7e86462271
|
ifdef CSS animations so that the feature can be backed out by flipping the switches in configure.in and then reverting the changes to the following four files appropriately: nsIDOMCSS2Properties.idl, nsIDOMCSSRule.idl, property_database.js, test_transitions_computed_values.html. (Bug 435442, patch 15) r=bzbarsky
|
2011-04-11 23:18:44 -07:00 |
|
Ed Morley
|
f640c1b693
|
Bug 523316 - Remove unused MOZ_PLACES_BOOKMARKS define; r=mak
|
2011-04-11 19:00:32 +02:00 |
|
Benjamin Smedberg
|
95a3d6d693
|
Bug 648593 - Remove JavaXPCOM and its build support code from the main tree, r=ted
--HG--
extra : rebase_source : 5e3a8c714bb3761ec20170789ac5fc7d5033fc11
|
2011-04-08 12:51:33 -07:00 |
|
Matheus Kerschbaum
|
93480c6366
|
Bug 639754 - Remove MOZ_IPC checks since IPC is always built now; r=bsmedberg
|
2011-04-02 19:14:00 -07:00 |
|
Masatoshi Kimura
|
0db310191f
|
Remove native uconv. Bug 644801, r=smontagu
|
2011-04-05 11:13:21 +03:00 |
|
Mitchell Field
|
59b853fca5
|
Bug 647118 - Remove support for --disable-plugins. r=glandium
|
2011-04-02 01:41:46 +11:00 |
|
Kyle Huey
|
61ff9410c4
|
Backed out changeset a5dbece71e4a due to test failures
|
2011-03-31 09:11:21 -04:00 |
|
Matheus Kerschbaum
|
1f81122982
|
Bug 639754 - Remove MOZ_IPC checks since IPC is always built now. r=bsmedberg
|
2011-03-31 07:22:55 -04:00 |
|
Kyle Huey
|
29d5f43cb5
|
Merge m-c to bs.
|
2011-03-31 07:17:15 -04:00 |
|
John Ford
|
9ff702033c
|
Bug 639884 - Teach packaging code how to create RPM files from normal builds r=glandium
|
2011-03-30 10:22:36 -07:00 |
|
Matheus Kerschbaum
|
255f1d6b3c
|
Bug 634807 - Remove MOZ_PLAINTEXT_EDITOR_ONLY; r=khuey
|
2011-03-24 19:59:00 -04:00 |
|
Kyle Huey
|
782df80bf2
|
Merge m-c to bs.
|
2011-03-19 07:56:17 -04:00 |
|
Jeremias Bosch
|
5190e6049c
|
Bug 630186 - Ensure Rotation functionality in Qt Port after removing meegotouch. r=wolfiR,mitchell.field a=approval2.0
|
2011-03-15 21:41:53 -07:00 |
|
Benoit Jacob
|
414b73f1d0
|
Bug 630628 - Extract d3dx9_*.dll and d3dcompiler_*.dll from DirectX SDK at build time, and ship them with the build - r=vlad, a=blocker
|
2011-02-07 20:11:52 -05:00 |
|
Justin Wood
|
bd3654e3bd
|
Bug 589506 - Scrub the codebase of MOZ_VIEW_SOURCE and MOZ_JSLOADER. r+=ted
|
2010-08-24 23:27:34 -04:00 |
|
Mike Hommey
|
6ef83c9db5
|
Bug 584474 part 9 - Replace fakelibs with a more sophisticated library expansion system. r=ted
|
2011-02-25 15:05:08 +01:00 |
|
Kyle Huey
|
5788258276
|
Merge m-c into bs.
|
2011-02-17 10:36:51 -05:00 |
|
Kyle Huey
|
974f7e890a
|
Merge mozilla-central into build-system
|
2011-01-26 08:56:56 -05:00 |
|
Mitchell Field
|
6e6d670c88
|
Bug 462361 - Remove support for building with Cygwin. r=khuey
|
2011-01-26 07:14:30 +11:00 |
|
Mike Hommey
|
6f2a78dca1
|
Bug 606145 part 3 - Integrate elfhack with the build system. r=khuey,a=bsmedberg
|
2011-01-24 09:56:40 +01:00 |
|
Justin Lebar
|
21f099bac3
|
Bug 585818 - Export CPU_ARCH and define INTEL_ARCHITECTURE to the build. r=khuey, a2.0=bsmedberg
--HG--
extra : rebase_source : 70993b47ea8843a02dc2143e344ecd40412ece39
|
2010-08-11 16:49:42 -07:00 |
|
Michael Wu
|
ff23778648
|
bug 620584 - add ANDROID_PACKAGE_NAME rather than hard code org.mozilla.@MOZ_APP_NAME@ r=ted,blassy a=stuart
|
2010-12-21 15:02:14 -05:00 |
|
Matt Brubeck
|
67b16b7df9
|
bug 617074 - Fix for building with Android 2.3 SDK (android-9 platform) r=mwu,khuey a2.0=dougt
|
2010-12-15 11:22:16 -08:00 |
|
Justin Lebar
|
d192740a12
|
Bug 573948 - Part 1: Use libjpeg-turbo instead of libjpeg. r=jmuizelaar
|
2010-07-19 10:34:41 -07:00 |
|
Jeremias Bosch
|
43d8ca0e70
|
Bug 626595 - Make it possible to build maemo 6 platform version without meegotouch r=romaxa,ted.mielczarek a=approval2.0
--HG--
extra : rebase_source : 435438ae2c39833353a958ba2770f0e44439d7bc
|
2011-02-03 08:31:36 +02:00 |
|
Mike Hommey
|
a2eef11357
|
Bug 628303 - Pass HOST_LDFLAGS to the build system. r=khuey,a=sdwilsh
|
2011-01-28 09:22:59 +01:00 |
|
Timothy B. Terriberry
|
ced4cd8f3f
|
Bug 627981 - [clang]: A lot of errors for libtheora; r=ted
|
2011-03-17 09:03:00 -04:00 |
|
Kyle Huey
|
16cf0c5018
|
Back out cl-as-a-native-command to fix Bug 615571. r=me a=NPOTB
|
2010-12-04 23:07:10 -05:00 |
|
Kyle Huey
|
db0879856c
|
Backed out changeset 0e9ba7c029e3
|
2010-12-04 23:05:58 -05:00 |
|
Vladimir Vukicevic
|
8db3cedac7
|
b=603367; use ANGLE for WebGL on Win32; r=bjacob
|
2010-12-03 14:44:01 -08:00 |
|
Kyle Huey
|
e0760603a1
|
Bug 585011 - Invoke cl.py as a pymake native command. r=Callek, a=bsmedberg
|
2010-08-08 23:12:54 -07:00 |
|
Mike Hommey
|
580a41a089
|
Bug 611405 part 1 - Export jemalloc symbols when linking with the xpcom standalone glue. r=bsmedberg,a=clegnitto
|
2010-11-17 09:56:19 +01:00 |
|
Brad Lassey
|
77ba0ab35f
|
bug 595919 - Implement PDF printing for "Save As PDF" on Android r=vlad a=blocking-fennec
|
2010-11-16 18:33:56 -05:00 |
|
Kyle Huey
|
99fecd3066
|
Backing out Bug 590181 since the GCC 4.5 upgrade failed on this CLOSED TREE
|
2010-11-11 12:36:01 -05:00 |
|
Justin Lebar
|
e5476a3105
|
Bug 590181 - Part 2: Use -O3 on Linux. r=ted, a2.0=dbaron (landing on CLOSED TREE)
|
2010-09-08 10:10:31 -07:00 |
|
Walter Meinl
|
48d1e8997b
|
Bug 577011 - [OS/2] make _declspec unconditionally default symbol export r=daveryeo@telus.net a=benjamin
--HG--
extra : rebase_source : f73a926174bd7905f177b2e914492e42b90ac8c0
|
2010-11-09 11:13:03 +01:00 |
|
Timothy B. Terriberry
|
529063d002
|
Bug 608066 - Update libvpx to v0.9.5. r=chris,khuey a=b-f
|
2010-11-08 09:47:17 +02:00 |
|
Mike Hommey
|
974d30cc03
|
Bug 577653 - Allow to build against system libvpx. r=khuey a=roc
|
2010-11-05 18:24:28 +01:00 |
|
Jory A. Pratt
|
ee9165f0b2
|
Bug 591145 - Remove configure checks for encoders. r=khuey a=bsmedberg
|
2010-11-05 18:23:05 +01:00 |
|
Justin Wood
|
ab2f3cf055
|
Bug 608173 - Build system should provide an intelligible error when switching from gmake to pymake or vice versa on an absolutely configured objdir. r=khuey, a=NPOTB
--HG--
extra : rebase_source : 821fd92d3e3473b47b39def3d2477a1195adc2f4
|
2010-10-28 22:51:00 -04:00 |
|
Brad Lassey
|
9734e16ccc
|
Bug 511348 - Fixes build bustage on Android thumb builds r=derf a=build-bustage
|
2010-10-19 09:46:53 -07:00 |
|
Timothy B. Terriberry
|
5e63566740
|
Bug 511348 - Integrate Tremor for Vorbis decoding for non/slow-FPU platforms. build changes. r=kyle a=blocking-fennec
--HG--
extra : rebase_source : 8a2b26f2150a440a2e289ddc94d9c3bfe6e23bbf
|
2010-10-18 19:56:01 -07:00 |
|
Tero Turtiainen
|
1ed4371ff3
|
Bug 582621 - Sharing back-end for MeeGo r=dougt a=blocking-fennec
--HG--
extra : rebase_source : 81386b7a9f512a2d060efcbe7b272bb0f4936fa4
|
2010-10-18 09:46:42 -07:00 |
|
Justin Lebar
|
a3298dd3ca
|
Bug 592923 - Add --enable-profiling configure option r=ted, a2.0=bz
|
2010-09-10 11:57:12 -07:00 |
|
Jonathan Kew
|
5a24d0498e
|
bug 527276 - part 2 - add OTS lib to the build process. r=ted a=blocking2.0
|
2010-10-07 08:59:18 +01:00 |
|
Bas Schouten
|
782eb0a4fe
|
Bug 546514 - Part 1: Detect presence of D3D10 headers for D3D10 layers. r=vlad
|
2010-10-01 00:53:44 +02:00 |
|
Mark Banner
|
ea96d78857
|
Bug 597465: Support linking app components into libxul. r=khuey a=blocking
|
2010-09-21 21:10:06 -04:00 |
|
Doug Turner
|
9178000989
|
Bug 567750 - Build option to use the system Pixman. r=khuey. a=dougt
|
2010-09-20 21:16:37 -07:00 |
|
Masatoshi Kimura
|
d6b46ad3d3
|
Add support for CL_INCLUDES_PREFIX environment variable for handling localized cl.exe /showIncludes output. (Bug 587372) r=ted a2.0=blocking2.0:final
|
2010-09-17 12:29:52 -07:00 |
|
jeremias bosch
|
ec1f70da46
|
Bug 586836 - Support Meego Network Managment. r=doug.turner a=blocking-fennec
--HG--
extra : rebase_source : 1f8de52621ce8c6dc680e81a3b82bc8f5e3df57e
|
2010-08-30 23:23:35 -07:00 |
|
Dan Witte
|
22afbc04f8
|
Bug 591537 - Freeze UA build id for Firefox branded builds. r=dao/khuey, sr=jst, a=beta5+
|
2010-08-28 13:42:04 -07:00 |
|
Dão Gottwald
|
abf1b55a37
|
Bug 591387 - Default theme shows as "incompatible" (version number wrapped with quotes). r=khuey a=blocking
|
2010-08-28 15:32:07 +02:00 |
|
Dão Gottwald
|
ff02b582e2
|
Bug 581008 - Remove support for appending arbitrary data to the User Agent string. r=jst,khuey sr=dveditz
|
2010-08-27 09:02:10 +02:00 |
|
Bobby Holley
|
8d69ad0207
|
Bug 513681 - part 2 - remove support for the MOZ_IMG_DECODERS build option.r=joe,khuey.a=blocker
|
2010-08-22 22:30:45 -04:00 |
|
Ted Mielczarek ext:(%20and%20Karl%20Tomlinson%20%3Ckarlt%2B%40karlt.net%3E)
|
da86351679
|
Add a GDK/X11 screenshot to png utility b=414049 r=dbaron a=npotb
--HG--
extra : rebase_source : c73326cce47805fd5ce7cda7b8e51b5dda1e39a7
|
2010-08-23 12:11:43 +12:00 |
|
Kyle Huey
|
c5800700be
|
Backing out Bug 513681 and Bug 587371 for timeouts.
|
2010-08-22 10:13:09 -04:00 |
|
Bobby Holley
|
9de0c252df
|
Bug 513681 - part 2 - remove support for the MOZ_IMG_DECODERS build option.r=joe,khuey.a=blocker
|
2010-08-11 20:12:24 -04:00 |
|
Takanori MATSUURA
|
d427515d05
|
Bug 587614. Remove MOZ_NO_INSPECTOR_APIS. r=ted,a=NPOTB
|
2010-08-19 21:44:34 +12:00 |
|
Dan Witte
|
53a5ef6fe9
|
Merge mozilla-central -> e10s.
|
2010-08-13 21:24:11 -07:00 |
|
Taras Glek
|
c3b1e9d1a0
|
Bug 580407 - Link js statically r=bsmedberg+khuey a=bsmedberg
|
2010-08-13 21:18:05 -07:00 |
|
Kyle Huey
|
c5fc54ad89
|
Bug 518136: Use -showIncludes to generate dependencies for MSVC for a substantial build performance win. r=ted
|
2010-08-04 16:59:23 -07:00 |
|
Steve Fink
|
082cfbef39
|
Bug 507012: function call/return callback for profiling, r=dmandelin, a=sayrer
|
2010-08-09 13:38:13 -07:00 |
|
Wolfgang Rosenauer
|
6d6be89e9b
|
Bug 517655 - Support for libProxy - Part 1. Build Changes. r=khuey
--HG--
extra : rebase_source : 47b4c922a01099fa569ee122ef0b2f545627f175
|
2010-08-03 10:44:49 -07:00 |
|
Oleg Romashin
|
d965d0a9ad
|
Bug 583039 - Bug switch to enable MeegoTouch support. r=khuey
--HG--
extra : rebase_source : dbbb3eedb99920c4e77d6106a2c34c854a0d9cc8
|
2010-08-02 13:15:57 -07:00 |
|
Kyle Huey
|
c83653fee9
|
Bug 508082: Implement a raw video decoder. Based on an earlier patch by Brad Lassey. r=doublec
|
2010-07-26 12:35:16 -07:00 |
|
Brad Lassey
|
d9940b5fd6
|
bug 577635 - android_stub.h broken for android platform version 8, pass ANDROID_VERSION to nss r=khuey
|
2010-07-19 14:05:29 -04:00 |
|
Zack Weinberg
|
cdb43c9602
|
Bug 571989 part 1: Move the contents of gfx/src/psshared into widget/src/gtk2, which is the sole user.
--HG--
rename : gfx/src/psshared/nsCUPSShim.cpp => widget/src/gtk2/nsCUPSShim.cpp
rename : gfx/src/psshared/nsCUPSShim.h => widget/src/gtk2/nsCUPSShim.h
rename : gfx/src/psshared/nsPSPrinters.cpp => widget/src/gtk2/nsPSPrinters.cpp
rename : gfx/src/psshared/nsPSPrinters.h => widget/src/gtk2/nsPSPrinters.h
rename : gfx/src/psshared/nsPaperPS.cpp => widget/src/gtk2/nsPaperPS.cpp
rename : gfx/src/psshared/nsPaperPS.h => widget/src/gtk2/nsPaperPS.h
|
2010-06-28 10:36:17 -07:00 |
|
Dave Townsend
|
b3dcc85c79
|
Bug 573079: Package Beta Feedback extension in beta release builds. r=ted, r=beltzner
|
2010-06-24 16:36:31 -07:00 |
|
Philipp von Weitershausen
|
d0e8724ce4
|
Bug 571902 - Land sync and crypto components on trunk [r=mconnor r=ted]
Hook 'services' into the build system with MOZ_SERVICES_SYNC not-yet-set as a browser confvar.
|
2010-06-21 17:07:13 -07:00 |
|
Kyle Huey
|
60c5aa6fd2
|
Backed out changeset f54e6386c113
--HG--
extra : rebase_source : 367bf92e0875df1663e79bd6b968cddd677eeb1c
|
2010-06-19 13:19:25 -07:00 |
|
Kyle Huey
|
5746184f5d
|
Bug 508082: Implement a raw video decoder. r=doublec
--HG--
extra : rebase_source : 2ffc36ceb9cb8407531efa6e7b1f0548e81c170c
|
2010-06-17 17:36:57 -07:00 |
|
Kyle Huey
|
72a3bb4d3c
|
Bug 561674: Finish removing DEBUG_<username> from the tree. r=ted
--HG--
extra : rebase_source : e1d21af437660367681dbe631e1b8f6852c68f16
|
2010-06-17 17:34:23 -07:00 |
|
Jonathan Kew
|
b3f16a685e
|
bug 449292 - part 2 - add harfbuzz library to the gfx build process. r=ted
|
2010-06-11 20:14:37 +01:00 |
|
Robert Strong
|
c0b9792c32
|
Followup bustage fix for Bug 569058 - don't use a cached var.
|
2010-06-09 16:23:00 -07:00 |
|
Robert Strong
|
d262698037
|
Bug 569058 - Upgrade NSIS version to 2.45 or later (PCA complains when installer is cancelled on Windows 7). configure.in, autoconf.mk.in, and makensis.mk changes only. r=ted.mielczarek
|
2010-06-09 16:01:46 -07:00 |
|
Chris Pearce
|
b87edb2f09
|
Bug 566247 - Add libvpx, VP8 decoding library for WebM. r=ted
|
2010-06-09 11:31:28 +12:00 |
|
Chris Pearce
|
2a11a80ccb
|
Bug 566247 - WebM build system changes. r=ted
|
2010-06-09 11:31:27 +12:00 |
|
Neil Rashbrook
|
9270d2e6b4
|
Bug 569490 Don't build D3D9 layer if we can't find d3d9.h r=ted,jmuizelaar
|
2010-06-06 11:37:44 +01:00 |
|
Makoto Kato
|
a6c423573f
|
Bug 521193 - jemalloc support for Windows x64 build (VC 2005 / 2008). r=ted
--HG--
rename : memory/jemalloc/crtvc8sp1.diff => memory/jemalloc/crtvc8sp1-intel.diff
rename : memory/jemalloc/crtvc9sp1.diff => memory/jemalloc/crtvc9sp1-intel.diff
|
2010-06-03 19:12:26 +09:00 |
|
Jory A. Pratt
|
c9e150d2ca
|
Bug 555562 - remove xpctools as no maintainer in 3 years. r=shaver
|
2010-05-24 11:31:27 +02:00 |
|
Michael Wu
|
dc2c7781b7
|
Bug 561471 - Add support for Android to configure.in, r=ted
|
2010-05-19 13:19:11 -07:00 |
|
Michael Wu
|
f33a4c4b9a
|
Bug 552121 - Add omnijar as a configure option [1/7], r=ted
|
2010-05-19 13:05:47 -07:00 |
|
Dave Townsend
|
e225f4a276
|
Bug 553169: Implement InstallTrigger, the XPI content handler and confirmation for web triggered installs. r=robstrong, r=dveditz
|
2010-04-29 13:11:23 -07:00 |
|
Serge Gautherie
|
8fc0512b9d
|
Bug 557958 - Get rid of MOZ_DISABLE_VISTA_SDK_REQUIREMENTS, which was deprecated in m-1.9.2; (Av1) Just get rid of it.
r=ted.mielczarek.
|
2010-05-04 17:30:31 +02:00 |
|
Dave Townsend
|
74b7768710
|
Backout new add-ons manager due to Ts regression on OSX 10.5
--HG--
rename : toolkit/mozapps/extensions/test/xpcshell/data/test_bug404024.xml => toolkit/mozapps/extensions/test/unit/data/test_bug404024.xml
rename : toolkit/mozapps/extensions/test/xpcshell/data/test_bug417606.xml => toolkit/mozapps/extensions/test/unit/data/test_bug417606.xml
rename : toolkit/mozapps/extensions/test/xpcshell/data/test_bug424262.xml => toolkit/mozapps/extensions/test/unit/data/test_bug424262.xml
rename : toolkit/mozapps/extensions/test/xpcshell/test_bug404024.js => toolkit/mozapps/extensions/test/unit/test_bug404024.js
rename : toolkit/mozapps/extensions/test/xpcshell/test_bug417606.js => toolkit/mozapps/extensions/test/unit/test_bug417606.js
rename : toolkit/mozapps/extensions/test/xpcshell/test_bug424262.js => toolkit/mozapps/extensions/test/unit/test_bug424262.js
rename : toolkit/mozapps/extensions/test/xpcshell/test_bug449027.js => toolkit/mozapps/extensions/test/unit/test_bug449027.js
rename : toolkit/mozapps/extensions/test/xpcshell/test_bug455906.js => toolkit/mozapps/extensions/test/unit/test_bug455906.js
rename : toolkit/mozapps/extensions/test/xpcshell/test_bug514327_3.js => toolkit/mozapps/extensions/test/unit/test_bug514327_3.js
rename : toolkit/mozapps/extensions/test/xpcshell/test_bug541420.js => toolkit/mozapps/extensions/test/unit/test_bug541420.js
|
2010-05-01 11:04:44 -07:00 |
|
Dave Townsend
|
4c0e7e140d
|
Bug 553169: Implement InstallTrigger, the XPI content handler and confirmation for web triggered installs. r=robstrong, r=dveditz
|
2010-04-29 13:11:23 -07:00 |
|
Chris Jones
|
6b359a22c7
|
Bug 560723: Interpose non-throwing mozilla variants of VC10 STL functions that throw exceptions. r=ehsan sr=bsmedberg
--HG--
rename : memory/mozalloc/throw_msvc.cpp => memory/mozalloc/msvc_throw_wrapper.cpp
|
2010-04-28 19:38:41 -05:00 |
|
Mike Hommey
|
7ef93c2266
|
Bug 448375 - Only depend on dbus-glib when needed. Depend on dbus instead [r=benjamin]
|
2010-04-24 09:39:53 +02:00 |
|
Doug Turner
|
e35d8e72d5
|
Bug 545869 - Remove small buffer #defines and use preferences. r=honza
|
2010-04-20 09:32:28 -07:00 |
|
Mike Hommey
|
f950f70917
|
Bug 558789 - Allow to build against system libevent [r=benjamin, r=cjones]
--HG--
extra : rebase_source : cd964ba40277ebd89dda8392c8a842ca9ef01bf8
|
2010-04-20 09:06:55 +02:00 |
|
Oleg Romashin
|
b92d32a775
|
Bug 556962 - Maemo geolocation provider is not compiling on Maemo 6. r=dougt.
|
2010-04-14 05:42:43 -04:00 |
|
Serge Gautherie
|
0ecee67708
|
(no bug) Remove remnant MOZ_CALENDAR since (at least) mozilla1.9.1.
(no review)
|
2010-04-04 04:38:09 +02:00 |
|
Chris Jones
|
7c959e67d7
|
Bug 551254: Allow reviewed+approved STL headers to be included through <foo>. (<algorithm> and <vector> are provisionally in the list because of their use in libpr0n, but need to be reviewed in followup bug 556700 and bug 556701). r=ehsan,ted,zwol
|
2010-04-02 12:58:11 -05:00 |
|
Chris Jones
|
996c23e86b
|
Backed out changeset cec7b12eb5e3
|
2010-04-02 13:20:22 -05:00 |
|
Chris Jones
|
94e6bcfee2
|
Bug 551254: Allow reviewed+approved STL headers to be included through <foo>. (<algorithm> and <vector> are provisionally in the list because of their use in libpr0n, but need to be reviewed in followup bug 556700 and bug 556701). r=ehsan,ted,zwol
|
2010-04-02 12:58:11 -05:00 |
|
Mitchell Field
|
f0d15512f1
|
bug 516758 - Remove more options from configure r=ted
|
2010-03-30 10:34:00 -04:00 |
|
Mark Banner
|
be4c9ad69d
|
Bug 552222 Drop MOZ_XPFE_COMPONENTS / --disable-xpfe-components. r=ted
|
2010-03-23 20:33:51 +00:00 |
|
Mitchell Field
|
d162651fc5
|
bug 517097 - make enabling debug symbols more sane r=ted
|
2010-03-02 06:24:00 -05:00 |
|