diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-23 10:50:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-23 11:42:34 +0000 |
| commit | b641929e69aa5917536fad72644d0da4d67f8adc (patch) | |
| tree | 92a95c566651b34b55461d2e8e7d5e1ef65b5e87 /compilerplugins | |
| parent | 597d178c2b516ab0cff4e4f86246d47ce9700f18 (diff) | |
merge StringNode with RscDefine
Change-Id: Ia64b7419ccbb06ff55907717963864caef2023a8
Reviewed-on: https://gerrit.libreoffice.org/32374
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 df4df30a5d4a..8a7db693dad3 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -137,7 +137,6 @@ merge StgAvlIterator with StgIterator merge StgAvlNode with StgDirEntry merge StgCache with StgIo merge StgReader with WW8Reader -merge StringNode with RscDefine merge SvListView with SvTreeListBox merge SvXMLExportItemMapper with SwXMLTableItemMapper_Impl merge SvXMLImportItemMapper with SwXMLImportTableItemMapper_Impl |