diff options
| author | Matthew Petroff <matthew@mpetroff.net> | 2013-09-20 17:05:24 +0000 |
|---|---|---|
| committer | Matthew Petroff <matthew@mpetroff.net> | 2013-09-20 17:05:24 +0000 |
| commit | 48b4ee48e518d65c3c5e49369a747c2aa4b0081b (patch) | |
| tree | 7159f8bc67d3f96ae43c42c32cacec6f7813f6fa /src/main.cpp | |
| parent | Fix bug in rectangle toolbar. (diff) | |
| parent | Fix grids after C++ification. Patch from Markus Engel (diff) | |
| download | inkscape-48b4ee48e518d65c3c5e49369a747c2aa4b0081b.tar.gz inkscape-48b4ee48e518d65c3c5e49369a747c2aa4b0081b.zip | |
Merge from trunk.
(bzr r12475.1.29)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index dccf70889..9a365424c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -78,7 +78,6 @@ #include "sp-namedview.h" #include "sp-guide.h" -#include "sp-object-repr.h" #include "xml/repr.h" #include "io/sys.h" @@ -854,8 +853,8 @@ static GSList *fixupFilenameEncoding( GSList* fl ) static int sp_common_main( int argc, char const **argv, GSList **flDest ) { /// \todo fixme: Move these to some centralized location (Lauris) - sp_object_type_register("sodipodi:namedview", SP_TYPE_NAMEDVIEW); - sp_object_type_register("sodipodi:guide", SP_TYPE_GUIDE); + //sp_object_type_register("sodipodi:namedview", SP_TYPE_NAMEDVIEW); + //sp_object_type_register("sodipodi:guide", SP_TYPE_GUIDE); // temporarily switch gettext encoding to locale, so that help messages can be output properly |