This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 2816cbe7b08a7a8e1f6b9ac0728fa9f875189809 Merge: 655bac5 57f668c Author: Pale Moon <git-repo@palemoon.org> Date: Thu May 3 08:39:21 2018 +0200 Merge branch 'master' into 27.9_RelBranch # Conflicts: # browser/config/version.txt browser/components/nsBrowserGlue.js | 2 +- browser/components/places/BrowserPlaces.manifest | 2 - browser/components/places/PlacesProtocolHandler.js | 49 - browser/components/places/moz.build | 4 - browser/installer/package-manifest.in | 2 - dom/media/MediaStreamGraph.cpp | 17 +- dom/media/TrackUnionStream.cpp | 3 - dom/media/mediasource/TrackBuffersManager.cpp | 2 + dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp | 6 + dom/media/platforms/ffmpeg/FFmpegFunctionList.h | 6 +- dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp | 13 + dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.h | 4 +- .../ffmpeg/ffmpeg58/include/COPYING.LGPLv2.1 | 504 ++ .../ffmpeg/ffmpeg58/include/libavcodec/avcodec.h | 6146 ++++++++++++++++++++ .../ffmpeg/ffmpeg58/include/libavcodec/avfft.h | 118 + .../ffmpeg/ffmpeg58/include/libavcodec/vaapi.h | 86 + .../ffmpeg/ffmpeg58/include/libavcodec/vdpau.h | 176 + .../ffmpeg/ffmpeg58/include/libavcodec/version.h | 137 + .../ffmpeg/ffmpeg58/include/libavutil/attributes.h | 167 + .../ffmpeg/ffmpeg58/include/libavutil/avconfig.h | 6 + .../ffmpeg/ffmpeg58/include/libavutil/avutil.h | 365 ++ .../ffmpeg/ffmpeg58/include/libavutil/buffer.h | 291 + .../ffmpeg58/include/libavutil/channel_layout.h | 232 + .../ffmpeg/ffmpeg58/include/libavutil/common.h | 560 ++ .../ffmpeg/ffmpeg58/include/libavutil/cpu.h | 130 + .../ffmpeg/ffmpeg58/include/libavutil/dict.h | 200 + .../ffmpeg/ffmpeg58/include/libavutil/error.h | 126 + .../ffmpeg/ffmpeg58/include/libavutil/frame.h | 893 +++ .../ffmpeg/ffmpeg58/include/libavutil/hwcontext.h | 584 ++ .../ffmpeg/ffmpeg58/include/libavutil/intfloat.h | 77 + .../ffmpeg/ffmpeg58/include/libavutil/log.h | 362 ++ .../ffmpeg/ffmpeg58/include/libavutil/macros.h | 50 + .../ffmpeg58/include/libavutil/mathematics.h | 242 + .../ffmpeg/ffmpeg58/include/libavutil/mem.h | 700 +++ .../ffmpeg/ffmpeg58/include/libavutil/pixfmt.h | 529 ++ .../ffmpeg/ffmpeg58/include/libavutil/rational.h | 214 + .../ffmpeg/ffmpeg58/include/libavutil/samplefmt.h | 272 + .../ffmpeg/ffmpeg58/include/libavutil/version.h | 139 + dom/media/platforms/ffmpeg/ffmpeg58/moz.build | 25 + dom/media/platforms/moz.build | 1 + gfx/cairo/cairo/src/cairo-mutex-impl-private.h | 23 +- js/src/jsstr.h | 3 +- memory/mozjemalloc/jemalloc.c | 354 +- mfbt/TextUtils.h | 58 + mfbt/moz.build | 1 + mfbt/tests/TestTextUtils.cpp | 106 + mfbt/tests/moz.build | 1 + 47 files changed, 13585 insertions(+), 403 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git