summaryrefslogtreecommitdiff
path: root/compilerplugins
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-01-19 20:56:58 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-01-20 09:43:28 +0000
commit4ebe24910441e7f382cff4ccc899515910c74c2c (patch)
tree5aa56197779b7038a4fa41423d976f6c7b4c9c78 /compilerplugins
parent62ea0ef8428ca4e12c5fa11674737a9bf0b646aa (diff)
drop basebmp entirely now
Change-Id: I534848c4be8eadf86b7f31ac742a80982405f56f
Diffstat (limited to 'compilerplugins')
-rw-r--r--compilerplugins/clang/mergeclasses.results1
1 files changed, 0 insertions, 1 deletions
diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results
index b5752a411ead..26695dbc540d 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -188,7 +188,6 @@ merge abp::OModuleResourceClient with abp::OABSPilotUno
merge accessibility::GridControlAccessibleElement with accessibility::AccessibleGridControlTableBase
merge accessibility::IComboListBoxHelper with VCLListBoxHelper
merge basctl::docs::IDocumentDescriptorFilter with basctl::(anonymous namespace)::FilterDocuments
-merge basebmp::BitmapDevice with basebmp::(anonymous namespace)::BitmapRenderer
merge basegfx::InterpolatorProvider3D with basegfx::RasterConverter3D
merge bib::OComponentListener with bib::OLoadListener
merge bib::OLoadListener with bib::FormControlContainer