From ac9373e65ed7908a19edc6f5c758af9b8232820b Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 4 Oct 2016 10:36:23 +0200 Subject: merge sd::FuOutline with sd::FuOutlineText Change-Id: Ie8191ac91175ba51f89809aaa53bc1ffacf42df0 Reviewed-on: https://gerrit.libreoffice.org/29520 Tested-by: Jenkins Reviewed-by: Noel Grandin --- compilerplugins/clang/mergeclasses.results | 1 - 1 file changed, 1 deletion(-) (limited to 'compilerplugins/clang/mergeclasses.results') 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 -- cgit