a0118a68d2
Bug 1175413 - Cleanup usages of MOZ_ICU_CFLAGS. r=mshal
2015-07-23 09:53:48 +09:00
04f33e7cf4
Bug 1183209 patch 3: update generated data files to Unicode 8, and adapt internal XIDMOD types to the new types in Unicode's xidmodifications.txt, r=jfkthame
2015-07-15 05:55:24 -07:00
824a27884c
Bug 1183209 patch 2: update data generation tools to Unicode 8, r=jfkthame
2015-07-15 05:55:09 -07:00
a8939590de
Bug 1182996 - Fix and add missing namespace comments. rs=ehsan
...
The bulk of this commit was generated by running:
run-clang-tidy.py \
-checks='-*,llvm-namespace-comment' \
-header-filter=^/.../mozilla-central/.* \
-fix
2015-07-13 08:25:42 -07:00
97bd348e1c
Bug 1179106 - Remove units data from ICU. r=Waldo
2015-07-08 18:49:58 +09:00
7d1e52f2ff
Bug 905127 - Part 1 - Make some functions from nsNetUtil not inline. r=jduell
2015-07-07 04:17:00 +02:00
9e451714f3
Bug 1075758 - Update String.prototype.normalize tests for normalization changes in ICU 55. r=arai
...
--HG--
extra : rebase_source : e853a46ec010b268419113577eb2814208e221eb
2015-06-16 23:53:04 -07:00
893125d2f1
Bug 1075758 - Use a larger buffer in pkgdata, corresponding to Mozilla's inordinately-long compiler command. r=m_kato
...
--HG--
extra : rebase_source : 8b394e0adb87164f1c45f9bf6cb7f7c911c3b32b
2015-06-14 22:47:37 -07:00
73ca79d7ee
Bug 1075758 - Remove the applied-upstream patch to pass the right argument type to InterlockedCompareExchange in ICU. r=glandium
...
--HG--
extra : rebase_source : fa4cc22b6e07639d6986dba4a0f78af11b718d95
2015-06-12 14:25:23 -07:00
ed8d339c69
Bug 1075758 - Update the local patch to suppress various clang warnings in ICU. r=glandium
...
--HG--
extra : rebase_source : c7a757bf5ac07710e865cc71e3d714395ce0c14b
2015-06-12 14:25:23 -07:00
164296655c
Bug 1075758 - Remove a patch properly qualifying a type in umutex.h (already landed upstream). r=glandium
...
--HG--
extra : rebase_source : 31f3e55260154ac7303965810f78f2a3e2d2dec1
2015-06-12 14:25:23 -07:00
17f4ad9eae
Bug 1075758 - Remove omitCollationRules patch, already performed upstream. r=glandium
...
--HG--
extra : rebase_source : b4e3b93b34cd2eedb3a589a3fe3737d5ff7b3c6b
2015-06-12 14:25:23 -07:00
c768d07426
Bug 1075758 - Apply the local patch for bug 915735 (it works without needing any updating). r=glandium
...
--HG--
extra : rebase_source : 353a70986aafc7a91103f82a9c1ede26a392bd4c
2015-06-12 14:25:23 -07:00
a9e538a45c
Bug 1075758 - Remove local patch to not override CC/CXX when building with *BSD -- patch landed upstream. r=glandium
...
--HG--
extra : rebase_source : b60f540d01c5e77b61bde1d19d057d64b0faa022
2015-06-12 14:25:23 -07:00
00a55420cd
Bug 1075758 - Remove local patch to make ICU build with MSYS/MSVC -- upstream has since acquired such support. r=glandium
...
--HG--
extra : rebase_source : c199be7e50a9c766abed0407a5c4dc423ed2d1f9
2015-06-12 14:25:23 -07:00
05ded8e0e9
Bug 1075758 - Update intl/icu/SVN-INFO for the update to 55.1. r=glandium
...
--HG--
extra : rebase_source : c4fd3fa05c45f9f4d55d7333d37a8e92d62bb8fc
2015-06-12 14:25:23 -07:00
6fde7ae314
Bug 1075758 - Remove layout, samples, tests, and various unused data files from ICU. r=glandium
...
--HG--
extra : rebase_source : 7058586470d197fc7fbdbd06314b7ac7ef76fb79
2015-06-12 14:25:23 -07:00
e7aaf06e9c
Bug 1075758 - Import a clean copy of ICU source, without doing any post-import fixups/local-patching at all on it. r=glandium
...
--HG--
extra : rebase_source : 77a3a9e0f0b983a94193eb2cc687f76551b11415
2015-06-12 14:25:17 -07:00
5ff37c47c1
Bug 1075758 - Adjust SVN URL in update-icu.sh to 55.1, add an early-exit so script is runnable without applying possibly-bad patches. r=glandium
...
--HG--
extra : rebase_source : 7ee2bc052bdacb301afa67162e46738642666c82
2015-06-12 14:24:59 -07:00
9d935bbe8f
Bug 1176462 - Remove nsTableDecoderSupport. r=smontagu
2015-06-22 23:01:40 +09:00
b89e046ffc
Bug 1170794 followup: Add 'override' annotations to Convert() & Reset() methods in intl/uconv. rs=ehsan
...
Landing on CLOSED TREE with a=RyanVM
The fixed warnings are "-Winconsistent-missing-override", and they started being spammed here because the main patch on this bug added another method to these classes, which was (correctly) labeled as 'override'. This meant these preexisting un-annotated methods "inconsistently missing" the annotation. So, adding the annotation to fix the inconsistency & make clang happy.
2015-06-18 12:09:23 -07:00
bd5b37dfbf
Bug 1170794 - patch 2 - Improve the length check of the input in nsUnicode*::GetMaxLength, r=dveditz
2015-06-17 12:38:29 +01:00
45578e03fa
Bug 1170794 - Improve the length check of the input in nsUnicode*::GetMaxLength, r=dveditz
2015-06-17 12:21:39 +01:00
4372177a26
Bug 1170932: Test handling of unmapped characters in unicode-to-codepage encoders
2015-06-02 23:53:25 +03:00
363a0d1e26
Bug 1170932: Improve error handling for the gbk encoder, r=emk
2015-06-03 00:18:38 +03:00
4703fc01c5
Bug 1171006: Fix some errors introduced in uconv tests by bug 943268, r=emk
2015-06-07 02:09:23 -07:00
9ccb6bc5e1
Bug 1169433 - Remove UnicharSelfTest and turn NormalizationTest into a gtest. r=glandium,smontagu
2015-06-04 13:44:55 -04:00
f0a5679f8a
Bug 1169248 - Fix GBK/GB18030 encoders. r=smontagu
...
--HG--
rename : intl/uconv/tests/unit/test_encode_gbk.js => intl/uconv/tests/unit/test_encode_gb18030.js
rename : intl/uconv/ucvcn/gbkuniq2b.uf => intl/uconv/ucvcn/gbkuniq.uf
2015-06-03 07:55:24 +09:00
ea7750bcb1
Bug 991983 - Define SOURCES as SourcePath. r=gps
2015-05-28 07:34:15 +09:00
2e2a504271
Bug 1119980 - Use 'snprintf' instead of 'sprintf' to avoid a warning on Lollipop-based builds. r=froydnj
...
--HG--
extra : source : 7468f9a3aa03520a29e138d4df431f0b5d90967c
2015-05-26 14:33:55 -04:00
2d8a6ecf05
Bug 947654 - Use font.*.x-math font preferences for MathML. r=karl, r=heycam
...
This also rearranges the list of default fonts and changes the preferred font to Latin Modern Math on all platforms.
--HG--
extra : rebase_source : 806b5f8ffcf5305e55f67c60756c438987646fd5
2015-05-25 02:40:00 +02:00
49dd872168
Back out 3 changesets (bug 1119980) for emulator-l bustage
...
CLOSED TREE
Backed out changeset 12ce98475c6e (bug 1119980)
Backed out changeset bdb8d05f8870 (bug 1119980)
Backed out changeset a68a18840492 (bug 1119980)
2015-05-25 18:48:51 -07:00
9934d127c1
Bug 1119980 - Use 'snprintf' instead of 'sprintf' to avoid a warning on Lollipop-based builds. r=froydnj
...
--HG--
extra : rebase_source : 4e915a12ba662ed45788238a5f0a45533888bd92
2015-05-25 20:45:17 -04:00
276b7e52b1
Bug 948466: Rename gfxPangoFonts to gfxFontconfigFonts. r=nical
...
--HG--
rename : gfx/thebes/gfxPangoFonts.cpp => gfx/thebes/gfxFontconfigFonts.cpp
rename : gfx/thebes/gfxPangoFonts.h => gfx/thebes/gfxFontconfigFonts.h
2015-05-20 17:44:09 +02:00
735ccdd101
Bug 968520 - Add mozilla::fallible to Fallible{Auto,}TArray::SetLength calls. r=froydnj
2015-05-18 13:50:35 -07:00
1f8d7454e3
Bug 968520 - Add mozilla::fallible to Fallible{Auto,}TArray::SetCapacity calls. r=froydnj
2015-05-18 13:50:34 -07:00
c917606f95
Bug 1043692 - Move DIST_INSTALL to moz.build. r=gps
2015-05-12 07:55:22 +09:00
29b4070568
Bug 1155539 - Remove obsolete encoding decoder telemetry probes. r=emk.
2015-04-29 18:20:39 +03:00
bf7710b503
Bug 1158131 - Add local resource whitelisting for string bundle channels. r=snorp
...
---
intl/strres/nsStringBundle.cpp | 9 +++++++++
1 file changed, 9 insertions(+)
--HG--
extra : rebase_source : ffda1dbcbe46d0c0864b523d09785a4c2a61b6c9
2015-04-30 18:07:49 +02:00
0653385d17
Bug 1149872 - Add the missing format specifiers. r=jduell
...
--HG--
extra : rebase_source : c8eae9123be0739ef0d7c34fb6794d9dce9bdebc
extra : histedit_source : 71aab00aa6e695497879681aab67ea3c6ace3d31
2015-04-02 01:56:00 -04:00
e193f90a5f
Bug 1003731 - Removal of transliteration. r=hsivonen
...
IGNORE IDL
--HG--
extra : rebase_source : 823a82df0b5590799b7e3e010c9f0aff8141f091
extra : histedit_source : 7a16332b7c8955a4b097467829b4300a128c59f8
2015-04-22 00:21:00 -04:00
924c9eb636
Bug 1134923 - Remove NS_Alloc/NS_Realloc/NS_Free. r=nfroyd
...
They are kept around for the sake of the standalone glue, which is used
for e.g. webapprt, which doesn't have direct access to jemalloc, and thus
still needs a wrapper to go through the xpcom function list and get to
jemalloc from there.
2015-05-01 09:40:30 +09:00
ebde6b9f4f
Bug 1157835: Remove the MSVC_ENABLE_PGO flag from the build system. r=glandium
...
--HG--
extra : rebase_source : 0c47c99bb8b92f8361a51fd81b20a2cc8647a986
2015-04-27 19:59:27 -04:00
f54f3ac732
Bug 1151908 - Updating our character property data with new Bidi info from Unicode 6.3. r=smontagu
...
--HG--
extra : rebase_source : 30ded48b101e138996fd819ee255275ec7a7a350
2015-04-17 14:19:39 -04:00
42d5db6e98
Bug 1155263 - missing <stdint.h> header in rulebrk.c r=dholbert
2015-04-16 10:25:33 -07:00
d2ded7d55b
Bug 1097804 - Part 2 - Added xpcomrt build of library containing unicode util functions. r=gps
...
Create a library containing nsISocketTransportService and nsIDNS that can be used to support standalone WebRTC
--HG--
extra : rebase_source : d960247f7548cd5abb4c3ba40dd1b3c4ec5966ed
2015-04-03 15:55:00 +02:00
684e29ad0d
Backed out changeset c7da4d4c09aa (bug 1097804)
2015-04-02 13:42:31 -07:00
68c75be71a
Bug 1097804 - Part 2, Added xpcomrt build of library containing unicode util functions. r=gps
...
Create a library containing nsISocketTransportService and nsIDNS that can be used to support standalone WebRTC
2015-04-02 12:13:47 -07:00
b077d9624d
Bug 1134920 - Use moz_xmalloc/moz_xrealloc/free instead of nsMemory::Alloc/Realloc/Free. r=nfroyd
2015-04-01 13:51:45 +09:00
c39e359c7d
Bug 1138293 - Use malloc/free/realloc/calloc instead of moz_malloc/moz_free/moz_realloc/moz_calloc. r=njn
...
The distinction between moz_malloc/moz_free and malloc/free is not
interesting. We are inconsistent in our use of one or the other, and
I wouldn't be surprised if we are mixing them anyways.
2015-03-31 12:32:49 +09:00
883849ee32
Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj
...
This patch was automatically generated using the following script:
function convert() {
echo "Converting $1 to $2..."
find . \
! -wholename "*/.git*" \
! -wholename "obj-ff-dbg*" \
-type f \
\( -iname "*.cpp" \
-o -iname "*.h" \
-o -iname "*.c" \
-o -iname "*.cc" \
-o -iname "*.idl" \
-o -iname "*.ipdl" \
-o -iname "*.ipdlh" \
-o -iname "*.mm" \) | \
xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}
convert MOZ_OVERRIDE override
convert MOZ_FINAL final
2015-03-21 12:28:04 -04:00
b252a27930
Bug 1142503 - don't use QueryInterface when the compiler can do the cast for us; r=ehsan
...
Calling QueryInterface with a statically known IID should typically not
be necessary. In those cases where it's not, the compiler can do the
cast for us, though we have to supply the reference-counting that
QueryInterface would do.
In passing, several redundant null-checks for the result of |new T| have
been deleted.
2015-03-12 09:43:50 -04:00
4063a569ed
Bug 958147 - Choose one of run-if or skip-if and get rid of the other.r=jmaher, mwargers
2015-03-03 08:46:37 -05:00
f657771fc2
Backed out changeset 8eef92e67922 (bug 1128033) for causing Bug 1135858.
...
--HG--
extra : rebase_source : 9ba5545a8eb7ede2ea152908437929299acae321
2015-02-24 11:13:21 -08:00
8161ac8243
Merge fx-team to m-c a=merge CLOSED TREE
2015-02-20 18:06:13 -08:00
461d0d9d2b
Bug 1134633 - convert makefile rules with props2arrays.py to use moz.build GENERATED_FILES; r=mshal
...
Now that GENERATED_FILES can generate makefile rules for generating
files, we can start moving rules from Makefile.in's into moz.build.
2015-02-19 10:35:08 -05:00
6aca4957a6
Bug 1128033 - Install hyphenation files with FINAL_TARGET_FILES. r=gps
...
--HG--
extra : rebase_source : ae9a8f8498d9b70f3a9a103fb544ae49e6551719
2015-01-30 14:17:19 -08:00
32ba31eb54
Bug 1105644 - Lowercase words before passing them to libhyphen, so as to match patterns fully. r=smontagu
2015-02-16 10:28:54 +00:00
1663e96baa
Backed out changeset e46f80935409 (bug 1105644) for ASAN reftest failures
2015-02-18 14:51:24 +01:00
98fd03c4e0
Bug 1105644 - Lowercase words before passing them to libhyphen, so as to match patterns fully. r=smontagu
2015-02-18 09:25:51 +00:00
87ba345f81
Bug 1133289 - Remove nonstandard expression closures from intl/locale. r=smontagu
2015-01-24 23:53:08 -08:00
242708cf72
Bug 1127201 (attempt 2, part 1) - Replace most NS_ABORT_IF_FALSE calls with MOZ_ASSERT. r=Waldo.
...
--HG--
extra : rebase_source : 488e401ff87e31a2074c4108c4df0572d9536667
2015-02-09 14:34:50 -08:00
d3826daa16
Back out Bug 1127201 (part 2) for various problems.
2015-02-06 15:04:32 -08:00
d34f0301b8
Bug 1127201 (part 2) - Convert all NS_ABORT_IF_FALSE calls to MOZ_ASSERT. r=Waldo.
...
--HG--
extra : rebase_source : 99182e70335d2b5ff95f8c528ae992d37294be3a
2015-02-04 20:05:36 -08:00
a35dbaeebf
Bug 1126593 - Add a global fallible instance, so that using fallible works directly, everywhere. r=njn
...
--HG--
rename : memory/mozalloc/fallible.h => memory/fallible/fallible.h
2015-02-02 09:56:13 +09:00
95d1846f2d
Bug 1126269 - Part 2: Remove a useless include from intl/lwbrk/th_char.h. r=smontagu
2015-01-30 08:53:47 +09:00
6137a8c380
Bug 958147 - Choose one of run-if or skip-if and get rid of the other. r=ted
2015-01-28 06:17:00 -05:00
a8bf98021a
Bug 1126447: Annotate overriding functions as MOZ_OVERRIDE in nsDateTimeFormatUnix.h. r=ehsan
2015-01-27 11:53:26 -08:00
27f5250355
Bug 1123345 - Use MOZ_ICU_CFLAGS instead of in-tree paths for build with system icu. r=glandium
2015-01-17 11:30:04 +08:00
6c486b0407
bug 1122100 - more MOZ_OVERRIDE in xpcomish stuff r=froydnj
2015-01-19 17:41:12 -05:00
73081c85f0
Bug 1005863 - Part 1: Use props2arrays for langGroups.properties. r=hsivonen
2015-01-14 07:30:49 +02:00
54b8e4e5e4
Bug 1110469 - Remove NS_OpenURI (r=sworkman)
2015-01-11 20:26:40 -08:00
7e5c201140
Bug 1118418 - Mark virtual overridden functions as MOZ_OVERRIDE in intl; r=smontagu
2015-01-06 23:33:50 -05:00
9081805245
Bug 1087733: Make JS callers of ios.newChannel call ios.newChannel2 in intl/ (r=smontagu)
2014-10-24 14:55:14 -07:00
fc7e1b9a5e
Bug 1101625 - mingw fixup.
2014-12-20 22:05:49 +01:00
537581b71a
Bug 1109972: nsHyphenator should not assume sizeof(bool) == sizeof(char). r=dbaron
2014-12-10 17:10:35 -08:00
e424225899
Bug 1107814 - Part 2: Mark some directories as FAIL_ON_WARNINGS conditionally for some compilers. r=gps
2014-12-04 01:11:14 -08:00
22d0c4b343
Bug 1107814 - Part 1: Mark more directories as FAIL_ON_WARNINGS for all compilers. r=gps
2014-12-04 16:24:03 -08:00
b4b9b9906a
Bug 1101625 part 2 - Remove the aIRI param since it's always true. And some minor code cleanup. r=smontagu
2014-12-01 15:55:15 +00:00
93a86d1a91
Bug 1101625 part 1 - Don't escape all non-ASCII characters when unsafe characters are found, just escape the unsafe characters. r=smontagu
2014-12-01 15:55:15 +00:00
d0f999a115
Bug 1104589 - Improve the mapping of lang tags to langGroup codes. r=smontagu
2014-11-26 10:24:16 +00:00
ad766a1fcb
Bug 1100071 patch 2: add macros for common tests whether bidi level is odd and whether two bidi levels have the same parity, r=dholbert
2014-11-20 12:45:22 +02:00
1c0ca6a690
Bug 1095298 - Ignore 'C' locale when initializing nsLocaleService on Android. r=emk
...
On Android Lollipop, our setlocale call returns "C", rather than the null it returns on earlier Android versions.
This impacts locale detection, causing devices to always appear to be in en-US.
This patch conditionally ignores "C" if MOZ_WIDGET_ANDROID is set.
2014-11-12 08:52:19 -08:00
da6a98dfa9
Bug 415491, part 4 - Make UnEscapeURIForUI always escape the result if it contains blacklisted characters. r=bzbarsky
2014-11-08 02:42:05 +00:00
42a64f6c96
Bug 415491, part 3 - Use NS_EscapeURL of _retval as the result. r=bzbarsky
2014-11-08 02:42:04 +00:00
decd558ea2
Bug 415491, part 1 - Make UnEscapeURIForUI escape the URI if it contains any 'network.IDN.blacklist_chars' characters (except space). r=bzbarsky
2014-11-08 02:42:04 +00:00
47c853314f
Bug 1077148 part 4 - Add and use new moz.build templates for Gecko programs and libraries. r=gps
...
There are, sadly, many combinations of linkage in use throughout the tree.
The main differentiator, though, is between program/libraries related to
Gecko or not. Kind of. Some need mozglue, some don't. Some need dependent
linkage, some standalone.
Anyways, these new templates remove the need to manually define the
right dependencies against xpcomglue, nspr, mozalloc and mozglue
in most cases.
Places that build programs and were resetting MOZ_GLUE_PROGRAM_LDFLAGS
or that build libraries and were resetting MOZ_GLUE_LDFLAGS can now
just not use those Gecko-specific templates.
2014-10-30 13:06:12 +09:00
eea1f5cc9b
Bug 1086527 - Make sure PluralForm.get can be called from strict mode. r=Mossop
2014-10-23 23:29:00 +02:00
280d4d0517
Bug 1045958 - Use raw ICU instead of CoreServices API in Unicode collation on Mac OS X r=josh.
2014-10-08 22:43:47 +08:00
917934b1e1
Bug 1079319 - Fix some more bad implicit constructors in intl; r=smontagu
2014-09-24 09:16:53 -04:00
d292ee73f1
Bug 1066735 - Remove root b2g and android specific xpcshell manifests, r=chmanchester
2014-10-07 18:18:28 -04:00
e42f0e109b
Bug 1072187 - Remove HZ-GB-2312. r=emk.
2014-09-26 15:12:02 +03:00
67a076444a
Bug 964225 - Remove the GBK decoder class and remove GB2312 as a Gecko-canonical encoding. r=emk.
2014-09-26 15:12:02 +03:00
962aed5f40
Bug 945215 - Map HZ-GB-2312 to the replacement encoding. r=emk.
...
--HG--
rename : dom/encoding/test/reftest/bug863728-1-ref.html => dom/encoding/test/reftest/bug945215-1-ref.html
rename : dom/encoding/test/reftest/bug863728-1.html => dom/encoding/test/reftest/bug945215-1.html
rename : dom/encoding/test/reftest/bug863728-2-ref.html => dom/encoding/test/reftest/bug945215-2-ref.html
rename : dom/encoding/test/reftest/bug863728-2.html => dom/encoding/test/reftest/bug945215-2.html
2014-09-24 12:23:28 +03:00
d6b3b7959d
Backed out changeset ce22b4d51b72 (bug 945215) for assertions in EncodingUtils.cpp; CLOSED TREE
2014-09-26 16:11:29 +01:00
4a493a3d61
Backed out changeset 6e5adc14dc82 (bug 964225)
2014-09-26 16:10:57 +01:00
30edf44348
Backed out changeset d0be07d7cf1b (bug 1072187) for test bustage on a CLOSED TREE
2014-09-26 15:48:14 +02:00
eac446fa48
Bug 1072187 - Remove HZ-GB-2312. r=emk.
2014-09-26 15:12:02 +03:00
c02f4630b6
Bug 964225 - Remove the GBK decoder class and remove GB2312 as a Gecko-canonical encoding. r=emk.
2014-09-26 15:12:02 +03:00
c57d908ac2
Bug 945215 - Map HZ-GB-2312 to the replacement encoding. r=emk.
...
--HG--
rename : dom/encoding/test/reftest/bug863728-1-ref.html => dom/encoding/test/reftest/bug945215-1-ref.html
rename : dom/encoding/test/reftest/bug863728-1.html => dom/encoding/test/reftest/bug945215-1.html
rename : dom/encoding/test/reftest/bug863728-2-ref.html => dom/encoding/test/reftest/bug945215-2-ref.html
rename : dom/encoding/test/reftest/bug863728-2.html => dom/encoding/test/reftest/bug945215-2.html
2014-09-24 12:23:28 +03:00
Makoto Kato
Simon Montagu
Birunthan Mohanathas
Emanuel Hoogeveen
Jeff Walden
Masatoshi Kimura
Daniel Holbert
Andrea Marchesini
Kartikaya Gupta
Mike Hommey
Botond Ballo
Frédéric Wang
Phil Ringnalda
Nicolas Belleville
Henri Sivonen
Eugen Sawin
theoneisneo
Andy Pusch
David Major
Ted Clancy
Fabrice Desré
Randall Barker
Wes Kocher
Ehsan Akhgari
Nathan Froyd
Anish
Nick Alexander
Jonathan Kew
Carsten "Tomcat" Book
Chris Peterson
Nicholas Nethercote
Andrew McCreight
jp111
Hector Zhao
Trevor Saunders
Christoph Kerschbaumer
Jacek Caban
Cameron Kaiser
Mats Palmgren
Richard Newman
Cosmin Malutan
Tooru Fujisawa
Andrew Halberstadt
Ed Morley