diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-04 10:36:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-04 12:19:10 +0000 |
| commit | ac9373e65ed7908a19edc6f5c758af9b8232820b (patch) | |
| tree | e1a0c8c6752b328b484e9a6a6e9c77213682b6cd /compilerplugins | |
| parent | 8a04fac29da8ae902bd5f0aac559129013274304 (diff) | |
merge sd::FuOutline with sd::FuOutlineText
Change-Id: Ie8191ac91175ba51f89809aaa53bc1ffacf42df0
Reviewed-on: https://gerrit.libreoffice.org/29520
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
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 254d14e8127d..29b47df1f4c5 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -290,7 +290,6 @@ merge sc::opencl::SumOfProduct with sc::opencl::OpSumProduct merge sc::opencl::XNPV with sc::opencl::OpXNPV merge sd::BroadcastHelperOwner with sd::DrawController merge sd::ClientInfo with sd::ClientInfoInternal -merge sd::FuOutline with sd::FuOutlineText merge sd::IBluetoothSocket with sd::BufferedStreamSocket merge sd::ICustomAnimationListController with sd::CustomAnimationPane merge sd::sidebar::IDisposable with sd::sidebar::PanelBase |