summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorathenian200 <athenian200@outlook.com>2020-03-06 12:39:04 -0600
committerathenian200 <athenian200@outlook.com>2020-03-06 12:39:04 -0600
commit2db2ffe56a9cbc89060a0b5d09ac2e05c0bbdbe1 (patch)
treeb8c34f4942386828a7050632a1cb28a36659cfe5
parenta26d1d4aa4367cd9843e46bd10d14bd24b4c9e47 (diff)
parent3b5e5c91dfeb4ca4a1f642457b2916a995ca44a6 (diff)
downloadbasilisk-2db2ffe56a9cbc89060a0b5d09ac2e05c0bbdbe1.tar.gz
Merge branch 'master' of https://github.com/MoonchildProductions/Basilisk into function-syntax
-rw-r--r--basilisk/installer/package-manifest.in10
m---------platform0
2 files changed, 1 insertions, 9 deletions
diff --git a/basilisk/installer/package-manifest.in b/basilisk/installer/package-manifest.in
index 1c54624..f09e6dc 100644
--- a/basilisk/installer/package-manifest.in
+++ b/basilisk/installer/package-manifest.in
@@ -213,7 +213,6 @@
@RESPATH@/components/dom_xhr.xpt
@RESPATH@/components/dom_xpath.xpt
@RESPATH@/components/dom_xul.xpt
-@RESPATH@/components/dom_presentation.xpt
@RESPATH@/components/downloads.xpt
@RESPATH@/components/editor.xpt
@RESPATH@/components/embed_base.xpt
@@ -236,7 +235,7 @@
@RESPATH@/components/jar.xpt
@RESPATH@/components/jsdebugger.xpt
@RESPATH@/components/jsdownloads.xpt
-@RESPATH@/browser/components/jsinspector.xpt
+@RESPATH@/components/jsinspector.xpt
@RESPATH@/components/layout_base.xpt
#ifdef NS_PRINTING
@RESPATH@/components/layout_printing.xpt
@@ -528,13 +527,6 @@
@RESPATH@/components/nsAsyncShutdown.manifest
@RESPATH@/components/nsAsyncShutdown.js
-@RESPATH@/components/PresentationDeviceInfoManager.manifest
-@RESPATH@/components/PresentationDeviceInfoManager.js
-@RESPATH@/components/BuiltinProviders.manifest
-@RESPATH@/components/PresentationControlService.js
-@RESPATH@/components/PresentationDataChannelSessionTransport.js
-@RESPATH@/components/PresentationDataChannelSessionTransport.manifest
-
; InputMethod API
@RESPATH@/components/MozKeyboard.js
@RESPATH@/components/InputMethod.manifest
diff --git a/platform b/platform
-Subproject 7832dded378423f245cb8cf8ef66c4c16a39f6e
+Subproject 88da01c294175f81091e1499374415404e27a57