diff options
| author | Martin Owens <doctormo@gmail.com> | 2014-03-27 19:22:24 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2014-03-27 19:22:24 +0000 |
| commit | 3c85270dc7bfe702a7b88dfc0361ef1ac31376f2 (patch) | |
| tree | dc20c5eb37bbbedab9cfd319d20b057a89513aa8 /src/ui/dialog/dialog-manager.cpp | |
| parent | Commit a merge to trunk, with probabal errors (diff) | |
| download | inkscape-3c85270dc7bfe702a7b88dfc0361ef1ac31376f2.tar.gz inkscape-3c85270dc7bfe702a7b88dfc0361ef1ac31376f2.zip | |
Get pollar tiling working agains with trunk
(bzr r11073.1.37)
Diffstat (limited to 'src/ui/dialog/dialog-manager.cpp')
| -rw-r--r-- | src/ui/dialog/dialog-manager.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp index 32ceb397a..47e1fdd30 100644 --- a/src/ui/dialog/dialog-manager.cpp +++ b/src/ui/dialog/dialog-manager.cpp @@ -150,12 +150,8 @@ DialogManager::DialogManager() { // registerFactory("PrintColorsPreviewDialog", &create<PrintColorsPreviewDialog, DockBehavior>); registerFactory("SvgFontsDialog", &create<SvgFontsDialog, DockBehavior>); registerFactory("Swatches", &create<SwatchesPanel, DockBehavior>); -<<<<<<< TREE - registerFactory("TileDialog", &create<ArrangeDialog, DockBehavior>); -======= + registerFactory("TileDialog", &create<ArrangeDialog, DockBehavior>); registerFactory("Symbols", &create<SymbolsDialog, DockBehavior>); - registerFactory("TileDialog", &create<TileDialog, DockBehavior>); ->>>>>>> MERGE-SOURCE registerFactory("Trace", &create<TraceDialog, DockBehavior>); registerFactory("PixelArt", &create<PixelArtDialog, DockBehavior>); registerFactory("Transformation", &create<Transformation, DockBehavior>); |