summaryrefslogtreecommitdiff
path: root/compilerplugins
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-07-05 08:49:48 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-07-05 09:44:26 +0000
commit64354e6479e750e4a126abfae5d3f32a1110315e (patch)
tree7e03a1cdfa9336c3959dff96ae1ae96f27541630 /compilerplugins
parentb6b34d538398f8214daa5b160f764dc8b82ff9c5 (diff)
merge BibTabPage with BibGeneralPage
Change-Id: I16a80e7e98fdd2be08b5a8ce586b709a3720e694 Reviewed-on: https://gerrit.libreoffice.org/26929 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
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 f4d84d9c64bb..84b085db0106 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -18,7 +18,6 @@ merge AbstractSwInsertDBColAutoPilot with AbstractSwInsertDBColAutoPilot_Impl
merge AddressWalker with AddressWalkerWriter
merge B3dTransformationSet with B3dViewport
merge B3dViewport with B3dCamera
-merge BibTabPage with BibGeneralPage
merge CSS1Parser with SvxCSS1Parser
merge CffGlobal with CffSubsetterContext
merge DbGridControl with FmGridControl