← Back to branch summary

~matthewpetroff/inkscape/gsoc-2013-unit-improvement

~matthewpetroff/inkscape/gsoc-2013-unit-improvement

Viewing all changes in revision 12491.

Committer: Matthew Petroff
Date: 2013-09-12 23:14:21 UTC
mfrom: (12475.1.35 trunk)
Revision ID: matthew@mpetroff.net-20130912231421-059gnfvnq0o9nniy

Merge from trunk.

files added:
astylerc

share/extensions/fontfix.conf

share/extensions/text_merge.inx

share/extensions/text_merge.py

src/extension/internal/emf-inout.cpp

src/extension/internal/emf-inout.h

src/extension/internal/emf-print.cpp

src/extension/internal/emf-print.h

src/extension/internal/metafile-print.cpp

src/extension/internal/metafile-print.h

src/extension/internal/text_reassemble.c

src/extension/internal/text_reassemble.h

src/extension/internal/wmf-inout.cpp

src/extension/internal/wmf-inout.h

src/extension/internal/wmf-print.cpp

src/extension/internal/wmf-print.h

src/libuemf

src/libuemf/CMakeLists.txt

src/libuemf/Makefile_insert

src/libuemf/README

src/libuemf/makefile.in

src/libuemf/symbol_convert.c

src/libuemf/symbol_convert.h

src/libuemf/uemf.c

src/libuemf/uemf.h

src/libuemf/uemf_endian.c

src/libuemf/uemf_endian.h

src/libuemf/uemf_print.c

src/libuemf/uemf_print.h

src/libuemf/uemf_utf.c

src/libuemf/uemf_utf.h

src/libuemf/uwmf.c

src/libuemf/uwmf.h

src/libuemf/uwmf_endian.c

src/libuemf/uwmf_endian.h

src/libuemf/uwmf_print.c

src/libuemf/uwmf_print.h

src/ui/dialog/new-from-template.cpp

src/ui/dialog/new-from-template.h

src/ui/dialog/template-load-tab.cpp

src/ui/dialog/template-load-tab.h

src/ui/dialog/template-widget.cpp

src/ui/dialog/template-widget.h

files removed:
src/extension/internal/emf-win32-inout.cpp

src/extension/internal/emf-win32-inout.h

src/extension/internal/emf-win32-print.cpp

src/extension/internal/emf-win32-print.h

files modified:
configure.ac

generate_POTFILES.sh

po/POTFILES.in

po/de.po

po/inkscape.pot

po/lv.po

po/uk.po

share/extensions/Makefile.am

share/extensions/simplestyle.py *

share/extensions/test/Makefile.am

share/extensions/test/run-all-extension-tests

share/templates/A4.svg

share/templates/A4_landscape.svg

share/templates/CD_cover_300dpi.svg

share/templates/CD_label_120x120.svg

share/templates/DVD_cover_regular_300dpi.svg

share/templates/DVD_cover_slim_300dpi.svg

share/templates/DVD_cover_superslim_300dpi.svg

share/templates/DVD_cover_ultraslim_300dpi.svg

share/templates/LaTeX_Beamer.svg

share/templates/Letter.svg

share/templates/Letter_landscape.svg

share/templates/Typography_Canvas.svg

share/templates/black_opaque.svg

share/templates/business_card_85x54mm.svg

share/templates/business_card_90x50mm.svg

share/templates/desktop_1024x768.svg

share/templates/desktop_1600x1200.svg

share/templates/desktop_640x480.svg

share/templates/desktop_800x600.svg

share/templates/fontforge_glyph.svg

share/templates/icon_16x16.svg

share/templates/icon_32x32.svg

share/templates/icon_48x48.svg

share/templates/icon_64x64.svg

share/templates/no_borders.svg

share/templates/no_layers.svg

share/templates/video_HDTV_1920x1080.svg

share/templates/video_NTSC_720x486.svg

share/templates/video_PAL_720x576.svg

share/templates/web_banner_468x60.svg

share/templates/web_banner_728x90.svg

share/templates/web_banners.svg

share/templates/white_opaque.svg

src/2geom/generic-rect.h

src/CMakeLists.txt

src/Makefile.am

src/attribute-rel-util.cpp

src/attributes-test.h

src/attributes.cpp

src/attributes.h

src/display/drawing-context.h

src/display/drawing-text.cpp

src/display/drawing-text.h

src/display/nr-style.cpp

src/display/nr-style.h

src/extension/CMakeLists.txt

src/extension/init.cpp

src/extension/internal/Makefile_insert

src/extension/internal/cairo-ps-out.cpp

src/extension/internal/cairo-render-context.cpp

src/extension/internal/cairo-render-context.h

src/extension/internal/cairo-renderer-pdf-out.cpp

src/extension/internal/cairo-renderer.cpp

src/extension/internal/cairo-renderer.h

src/extension/internal/latex-text-renderer.cpp

src/extension/internal/latex-text-renderer.h

src/file.cpp

src/file.h

src/helper/CMakeLists.txt

src/helper/geom.cpp

src/helper/geom.h

src/interface.cpp

src/libnrtype/FontInstance.cpp

src/libnrtype/Layout-TNG-Compute.cpp

src/libnrtype/Layout-TNG-Output.cpp

src/libnrtype/Layout-TNG.h

src/libnrtype/font-instance.h

src/menus-skeleton.h

src/preferences-skeleton.h

src/preferences-test.h

src/sp-image.cpp

src/splivarot.cpp

src/splivarot.h

src/style.cpp

src/style.h

src/svg/path-string.cpp

src/svg/path-string.h

src/svg/svg-length.cpp

src/text-editing.cpp

src/ui/CMakeLists.txt

src/ui/clipboard.cpp

src/ui/dialog/Makefile_insert

src/ui/dialog/export.cpp

src/ui/dialog/filter-effects-dialog.cpp

src/ui/dialog/inkscape-preferences.cpp

src/ui/dialog/inkscape-preferences.h

src/ui/dialog/layers.cpp

src/util/units.cpp

src/verbs.cpp

src/verbs.h

src/widgets/dash-selector.cpp

src/widgets/dash-selector.h

src/xml/repr-io.cpp

Show diffs side-by-side

added added

removed removed

generate_POTFILES.sh

po/inkscape.pot

src/2geom/generic-rect.h

src/CMakeLists.txt

src/Makefile.am

src/attribute-rel-util.cpp

src/attributes-test.h

src/attributes.cpp

src/attributes.h

src/display/drawing-context.h

src/display/drawing-text.cpp

src/display/drawing-text.h

src/display/nr-style.cpp

src/display/nr-style.h

src/extension/CMakeLists.txt

src/extension/init.cpp

src/extension/internal/Makefile_insert

src/extension/internal/cairo-ps-out.cpp

src/extension/internal/cairo-render-context.cpp

src/extension/internal/cairo-render-context.h

src/extension/internal/cairo-renderer-pdf-out.cpp

src/extension/internal/cairo-renderer.cpp

src/extension/internal/cairo-renderer.h

src/extension/internal/emf-inout.cpp

src/extension/internal/emf-inout.h

src/extension/internal/emf-print.cpp

src/extension/internal/emf-print.h

src/extension/internal/emf-win32-inout.cpp

src/extension/internal/emf-win32-inout.h

src/extension/internal/emf-win32-print.cpp

src/extension/internal/emf-win32-print.h

src/extension/internal/latex-text-renderer.cpp

src/extension/internal/latex-text-renderer.h

src/extension/internal/metafile-print.cpp

src/extension/internal/metafile-print.h

src/extension/internal/text_reassemble.c

src/extension/internal/text_reassemble.h

src/extension/internal/wmf-inout.cpp

src/extension/internal/wmf-inout.h

src/extension/internal/wmf-print.cpp

src/extension/internal/wmf-print.h

src/helper/CMakeLists.txt

src/helper/geom.cpp

src/helper/geom.h

src/interface.cpp

src/libnrtype/FontInstance.cpp

src/libnrtype/Layout-TNG-Compute.cpp

src/libnrtype/Layout-TNG-Output.cpp

src/libnrtype/Layout-TNG.h

src/libnrtype/font-instance.h

src/libuemf/CMakeLists.txt

src/libuemf/Makefile_insert

src/libuemf/README

src/libuemf/makefile.in

src/libuemf/symbol_convert.c

src/libuemf/symbol_convert.h

src/libuemf/uemf.c

src/libuemf/uemf.h

src/libuemf/uemf_endian.c

src/libuemf/uemf_endian.h

src/libuemf/uemf_print.c

src/libuemf/uemf_print.h

src/libuemf/uemf_utf.c

src/libuemf/uemf_utf.h

src/libuemf/uwmf.c

src/libuemf/uwmf.h

src/libuemf/uwmf_endian.c

src/libuemf/uwmf_endian.h

src/libuemf/uwmf_print.c

src/libuemf/uwmf_print.h

src/menus-skeleton.h

src/preferences-skeleton.h

src/preferences-test.h

src/sp-image.cpp

src/splivarot.cpp

src/splivarot.h

src/svg/path-string.cpp

src/svg/path-string.h

src/svg/svg-length.cpp

src/text-editing.cpp

src/ui/CMakeLists.txt

src/ui/clipboard.cpp

src/ui/dialog/Makefile_insert

src/ui/dialog/export.cpp

src/ui/dialog/filter-effects-dialog.cpp

src/ui/dialog/inkscape-preferences.cpp

src/ui/dialog/inkscape-preferences.h

src/ui/dialog/layers.cpp

src/ui/dialog/new-from-template.cpp

src/ui/dialog/new-from-template.h

src/ui/dialog/template-load-tab.cpp

src/ui/dialog/template-load-tab.h

src/util/units.cpp

src/widgets/dash-selector.cpp

src/widgets/dash-selector.h

src/xml/repr-io.cpp

Older »