diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-24 21:01:13 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-25 05:41:08 +0200 |
| commit | 78f6407978aa48c3cbb116bc281940dbf1f2dcbc (patch) | |
| tree | 9be6625c9795a1c04ff0023a50b233c7e3e017c9 /sc/source/ui/unoobj/tokenuno.cxx | |
| parent | de61b526192cf99f6753eff4bf9ce2ab60da69bf (diff) | |
fix build after rebase
Conflicts:
sd/source/ui/slidesorter/view/SlideSorterView.cxx
sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
Change-Id: Id014a49dbbb33123d2d04f9f33954b77575f2e9e
Diffstat (limited to 'sc/source/ui/unoobj/tokenuno.cxx')
0 files changed, 0 insertions, 0 deletions