diff options
| author | Martin Owens <doctormo@gmail.com> | 2014-03-27 01:33:44 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2014-03-27 01:33:44 +0000 |
| commit | 5a4fb2325f60d292b47330f540b26a3279341c90 (patch) | |
| tree | d2aa7967be25450b83e625025366c618101ae49f /src/widgets/Makefile_insert | |
| parent | The Polar Arrange Tab of the Arrange Dialog now hides the parametric (diff) | |
| parent | Remove Snap menu item and improve grid menu item text (diff) | |
| download | inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.tar.gz inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.zip | |
Commit a merge to trunk, with probabal errors
(bzr r11073.1.36)
Diffstat (limited to 'src/widgets/Makefile_insert')
| -rw-r--r-- | src/widgets/Makefile_insert | 41 |
1 files changed, 39 insertions, 2 deletions
diff --git a/src/widgets/Makefile_insert b/src/widgets/Makefile_insert index 255767d43..97713cbee 100644 --- a/src/widgets/Makefile_insert +++ b/src/widgets/Makefile_insert @@ -1,16 +1,28 @@ ## Makefile.am fragment sourced by src/Makefile.am. ink_common_sources += \ + widgets/arc-toolbar.cpp \ + widgets/arc-toolbar.h \ + widgets/box3d-toolbar.cpp \ + widgets/box3d-toolbar.h \ widgets/button.cpp \ widgets/button.h \ + widgets/calligraphy-toolbar.cpp \ + widgets/calligraphy-toolbar.h \ + widgets/connector-toolbar.cpp \ + widgets/connector-toolbar.h \ widgets/dash-selector.cpp \ widgets/dash-selector.h \ widgets/desktop-widget.cpp \ widgets/desktop-widget.h \ + widgets/dropper-toolbar.cpp \ + widgets/dropper-toolbar.h \ widgets/eek-preview.cpp \ widgets/eek-preview.h \ widgets/ege-paint-def.cpp \ widgets/ege-paint-def.h \ + widgets/eraser-toolbar.cpp \ + widgets/eraser-toolbar.h \ widgets/fill-style.cpp \ widgets/fill-style.h \ widgets/fill-n-stroke-factory.h \ @@ -26,18 +38,34 @@ ink_common_sources += \ widgets/gradient-vector.h \ widgets/icon.cpp \ widgets/icon.h \ + widgets/lpe-toolbar.cpp \ + widgets/lpe-toolbar.h \ + widgets/measure-toolbar.cpp \ + widgets/measure-toolbar.h \ + widgets/mesh-toolbar.cpp \ + widgets/mesh-toolbar.h \ + widgets/node-toolbar.cpp \ + widgets/node-toolbar.h \ widgets/paint-selector.cpp \ widgets/paint-selector.h \ + widgets/paintbucket-toolbar.cpp \ + widgets/paintbucket-toolbar.h \ + widgets/pencil-toolbar.cpp \ + widgets/pencil-toolbar.h \ + widgets/rect-toolbar.cpp \ + widgets/rect-toolbar.h \ widgets/ruler.cpp \ widgets/ruler.h \ widgets/select-toolbar.cpp \ widgets/select-toolbar.h \ widgets/shrink-wrap-button.cpp \ widgets/shrink-wrap-button.h \ + widgets/spray-toolbar.cpp \ + widgets/spray-toolbar.h \ + widgets/spiral-toolbar.cpp \ + widgets/spiral-toolbar.h \ widgets/sp-attribute-widget.cpp \ widgets/sp-attribute-widget.h \ - widgets/sp-color-gtkselector.cpp \ - widgets/sp-color-gtkselector.h \ widgets/sp-color-icc-selector.cpp \ widgets/sp-color-icc-selector.h \ widgets/sp-color-notebook.cpp \ @@ -62,14 +90,23 @@ ink_common_sources += \ widgets/sp-xmlview-content.h \ widgets/sp-xmlview-tree.cpp \ widgets/sp-xmlview-tree.h \ + widgets/star-toolbar.cpp \ + widgets/star-toolbar.h \ widgets/stroke-marker-selector.cpp \ widgets/stroke-marker-selector.h \ widgets/stroke-style.cpp \ widgets/stroke-style.h \ widgets/swatch-selector.cpp \ widgets/swatch-selector.h \ + widgets/text-toolbar.cpp \ + widgets/text-toolbar.h \ widgets/toolbox.cpp \ widgets/toolbox.h \ + widgets/tweak-toolbar.cpp \ + widgets/tweak-toolbar.h \ + widgets/widget-sizes.h \ + widgets/zoom-toolbar.cpp \ + widgets/zoom-toolbar.h \ widgets/widget-sizes.h widgets/button.$(OBJEXT): helper/sp-marshal.h |