diff options
| author | Noel Grandin <noel@peralex.com> | 2016-07-04 10:41:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-07-04 12:21:58 +0000 |
| commit | c752aad43352478ef7065ca7ab844650811e6745 (patch) | |
| tree | b532c9f6f38634733f48753fa75b12f37c132e79 /compilerplugins | |
| parent | 3459ab4a5de1af443a85f66cecc0eeeb6d46df3f (diff) | |
merge vcl::DisplayConnectionDispatch with vcl::DisplayConnection
Change-Id: I0eb83905896e1d7549a5bd4adde45e9d69209401
Reviewed-on: https://gerrit.libreoffice.org/26888
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'compilerplugins')
| -rw-r--r-- | compilerplugins/clang/mergeclasses.results | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results index aa8ff7d639f3..1785f4cecf3f 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -390,7 +390,6 @@ merge tdoc_ucp::OfficeDocumentsEventListener with tdoc_ucp::ContentProvider merge toolkit::ScrollableInterface with toolkit::ScrollableWrapper merge unographic::GraphicTransformer with unographic::Graphic merge vcl::DeletionNotifier with SalFrame -merge vcl::DisplayConnectionDispatch with vcl::DisplayConnection merge vcl::ExtOutDevData with vcl::PDFExtOutDevData merge vcl::SolarThreadExecutor with vcl::solarthread::detail::GenericSolarThreadExecutor merge vclcanvas::DeviceHelper with vclcanvas::SpriteDeviceHelper |