diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-04-22 20:58:36 +0000 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-04-22 20:58:36 +0000 |
| commit | ab5f78afbdbf3b37f89c06dcd59ff9442d6ecf14 (patch) | |
| tree | 55a1e7c2bf2007f88cc5518052419bee63126688 /gfx/ipc | |
| parent | 9ffed6e8bfb35c090caf5f8bca7a0f8bd4cbec94 (diff) | |
| parent | 1d7664d3a1db098024c7624650b0d272a26635e0 (diff) | |
| download | UXP-ab5f78afbdbf3b37f89c06dcd59ff9442d6ecf14.tar UXP-ab5f78afbdbf3b37f89c06dcd59ff9442d6ecf14.tar.gz UXP-ab5f78afbdbf3b37f89c06dcd59ff9442d6ecf14.tar.lz UXP-ab5f78afbdbf3b37f89c06dcd59ff9442d6ecf14.tar.xz UXP-ab5f78afbdbf3b37f89c06dcd59ff9442d6ecf14.zip | |
Merge branch 'master' into Pale_Moon-release
# Conflicts:
# application/palemoon/config/version.txt
# old-configure.in
Diffstat (limited to 'gfx/ipc')
| -rw-r--r-- | gfx/ipc/GPUParent.cpp | 1 | ||||
| -rw-r--r-- | gfx/ipc/moz.build | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/gfx/ipc/GPUParent.cpp b/gfx/ipc/GPUParent.cpp index 9ff6cba9e..6833f5690 100644 --- a/gfx/ipc/GPUParent.cpp +++ b/gfx/ipc/GPUParent.cpp @@ -24,7 +24,6 @@ #include "mozilla/dom/VideoDecoderManagerChild.h" #include "mozilla/layers/LayerTreeOwnerTracker.h" #include "nsDebugImpl.h" -#include "nsExceptionHandler.h" #include "nsThreadManager.h" #include "prenv.h" #include "ProcessUtils.h" diff --git a/gfx/ipc/moz.build b/gfx/ipc/moz.build index ff3a81228..309681444 100644 --- a/gfx/ipc/moz.build +++ b/gfx/ipc/moz.build @@ -70,7 +70,6 @@ IPDL_SOURCES = [ LOCAL_INCLUDES += [ '/dom/ipc', - '/toolkit/crashreporter', '/xpcom/threads', ] |