summaryrefslogtreecommitdiff
path: root/js/src/vm
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-04-15 11:50:14 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-04-15 11:51:11 +0200
commit9146af09bced055fa812d4f240cf80b7ee5813d1 (patch)
treec511e5060d170f181c10155c0a5a3583fe66b756 /js/src/vm
parent60a59bc4d5bb837b3d710a242979a79124c8e0f7 (diff)
parent54b64d9f9fe60352a779c4beb0190d25dbb299a4 (diff)
downloadaura-central-9146af09bced055fa812d4f240cf80b7ee5813d1.tar.gz
Merge branch 'html_input_datetime_1'
This is almost everything needed for %162.
Diffstat (limited to 'js/src/vm')
-rw-r--r--js/src/vm/SelfHosting.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/js/src/vm/SelfHosting.cpp b/js/src/vm/SelfHosting.cpp
index bf49f2268..9a8ec7679 100644
--- a/js/src/vm/SelfHosting.cpp
+++ b/js/src/vm/SelfHosting.cpp
@@ -2477,6 +2477,7 @@ static const JSFunctionSpec intrinsic_functions[] = {
JS_FN("intl_FormatDateTime", intl_FormatDateTime, 2,0),
JS_FN("intl_FormatNumber", intl_FormatNumber, 2,0),
JS_FN("intl_GetCalendarInfo", intl_GetCalendarInfo, 1,0),
+ JS_FN("intl_ComputeDisplayNames", intl_ComputeDisplayNames, 3,0),
JS_FN("intl_IsValidTimeZoneName", intl_IsValidTimeZoneName, 1,0),
JS_FN("intl_NumberFormat", intl_NumberFormat, 2,0),
JS_FN("intl_NumberFormat_availableLocales", intl_NumberFormat_availableLocales, 0,0),