diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-05-08 12:30:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-05-09 12:31:56 +0200 |
| commit | afccbe23cecc04a08281a91e02bb25dd7b0ffdcf (patch) | |
| tree | e7865f837752349ecd4b9d5c50da56cadeda9783 /compilerplugins | |
| parent | 3efb1714d7095898389f86258e805a62e7468a19 (diff) | |
merge GalleryFileStorageEntry with GalleryBinaryEngineEntry
Change-Id: I21b3f49cdf04b021931ab9e1171bfffa5cd76e1f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151552
Tested-by: Jenkins
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 e92d1bfc19b7..a1e8c6be6e3d 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -55,7 +55,6 @@ merge FmXDisposeListener with DisposeListenerGridBridge merge FmXFormShell_Base_Disambiguation with FmXFormShell merge GLWindow with GLX11Window merge GalleryFileStorage with GalleryBinaryEngine -merge GalleryFileStorageEntry with GalleryBinaryEngineEntry merge GroupTable with PPTWriterBase merge HostDetailsContainer with DavDetailsContainer merge IDocumentChartDataProviderAccess with sw::DocumentChartDataProviderManager |