diff options
| author | Adrian Boguszewski <adrbogus1@student.pg.gda.pl> | 2016-08-03 14:56:48 +0000 |
|---|---|---|
| committer | Adrian Boguszewski <adrbogus1@student.pg.gda.pl> | 2016-08-03 14:56:48 +0000 |
| commit | 2d71db83e3fe52505116fecf024f79a9777d4ee1 (patch) | |
| tree | 07b5e7b87af9ea1ba6bedd8b39fd96b0a13944c7 /src/resource-manager.cpp | |
| parent | Renamed some functions, fixed tests (diff) | |
| parent | Removed unused includes, decreased compilation time. Once again (diff) | |
| download | inkscape-2d71db83e3fe52505116fecf024f79a9777d4ee1.tar.gz inkscape-2d71db83e3fe52505116fecf024f79a9777d4ee1.zip | |
Merged trunk
(bzr r14954.1.29)
Diffstat (limited to 'src/resource-manager.cpp')
| -rw-r--r-- | src/resource-manager.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/resource-manager.cpp b/src/resource-manager.cpp index 09b9364c6..188b7d9c8 100644 --- a/src/resource-manager.cpp +++ b/src/resource-manager.cpp @@ -11,10 +11,10 @@ #include <algorithm> #include <gtkmm/recentmanager.h> #include <glibmm/i18n.h> -#include <glibmm/convert.h> -#include <glibmm/fileutils.h> #include <glibmm/miscutils.h> +#include <glibmm/fileutils.h> #include <glibmm/uriutils.h> +#include <glibmm/convert.h> #include "resource-manager.h" @@ -24,8 +24,6 @@ #include "document-undo.h" #include "verbs.h" -#include <set> - namespace Inkscape { static std::vector<std::string> splitPath( std::string const &path ) |