diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-10-20 22:21:45 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-10-20 22:21:45 +0000 |
| commit | f1e0309a7ffe42441f86def97f54aa57d86f1624 (patch) | |
| tree | 7226490a904223b0fd208c488ae157d9a92bc819 /src/display | |
| parent | Progress Bar workinggit add .git add . (diff) | |
| parent | Merge branch 'smartpointer_refactor' of gitlab.com:jali/inkscape (diff) | |
| download | inkscape-f1e0309a7ffe42441f86def97f54aa57d86f1624.tar.gz inkscape-f1e0309a7ffe42441f86def97f54aa57d86f1624.zip | |
Merge branch 'master' into SymbolsSearch
Diffstat (limited to 'src/display')
| -rw-r--r-- | src/display/drawing-surface.h | 1 | ||||
| -rw-r--r-- | src/display/makefile.in | 17 |
2 files changed, 0 insertions, 18 deletions
diff --git a/src/display/drawing-surface.h b/src/display/drawing-surface.h index 7bec1606a..78471649a 100644 --- a/src/display/drawing-surface.h +++ b/src/display/drawing-surface.h @@ -12,7 +12,6 @@ #ifndef SEEN_INKSCAPE_DISPLAY_DRAWING_SURFACE_H #define SEEN_INKSCAPE_DISPLAY_DRAWING_SURFACE_H -#include <boost/shared_ptr.hpp> #include <cairo.h> #include <2geom/affine.h> #include <2geom/rect.h> diff --git a/src/display/makefile.in b/src/display/makefile.in deleted file mode 100644 index 747f18e11..000000000 --- a/src/display/makefile.in +++ /dev/null @@ -1,17 +0,0 @@ -# Convenience stub makefile to call the real Makefile. - -@SET_MAKE@ - -OBJEXT = @OBJEXT@ - -# Explicit so that it's the default rule. -all: - cd .. && $(MAKE) display/all - -clean %.a %.$(OBJEXT): - cd .. && $(MAKE) display/$@ - -.PHONY: all clean - -.SUFFIXES: -.SUFFIXES: .a .$(OBJEXT) |