r16222 by jghali - merge trunk revisions up to r16221

scribus-commit scribus-commit at lists.scribus.net
Fri Jan 7 17:35:29 CET 2011 

Author: jghali
Date: Fri Jan  7 16:35:29 2011
New Revision: 16222

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16222
Log:
merge trunk revisions up to r16221

Added:
    branches/ScribusOIF/resources/icons/16/draw-arc.png
      - copied unchanged from r16219, trunk/Scribus/resources/icons/16/draw-arc.png
    branches/ScribusOIF/resources/icons/22/draw-arc.png
      - copied unchanged from r16219, trunk/Scribus/resources/icons/22/draw-arc.png
    branches/ScribusOIF/scribus/canvasmode_editarc.cpp
      - copied unchanged from r16219, trunk/Scribus/scribus/canvasmode_editarc.cpp
    branches/ScribusOIF/scribus/canvasmode_editarc.h
      - copied unchanged from r16219, trunk/Scribus/scribus/canvasmode_editarc.h
    branches/ScribusOIF/scribus/pageitem_arc.cpp
      - copied unchanged from r16219, trunk/Scribus/scribus/pageitem_arc.cpp
    branches/ScribusOIF/scribus/pageitem_arc.h
      - copied unchanged from r16219, trunk/Scribus/scribus/pageitem_arc.h
Modified:
    branches/ScribusOIF/TRANSLATION
    branches/ScribusOIF/resources/translations/po/scribus.nb_NO.ts
    branches/ScribusOIF/resources/versions/scribusversions.xml
    branches/ScribusOIF/scribus/CMakeLists.txt
    branches/ScribusOIF/scribus/actionmanager.cpp
    branches/ScribusOIF/scribus/canvas.h
    branches/ScribusOIF/scribus/canvasmode.cpp
    branches/ScribusOIF/scribus/canvasmode_create.cpp
    branches/ScribusOIF/scribus/canvasmode_normal.cpp
    branches/ScribusOIF/scribus/pageitem.cpp
    branches/ScribusOIF/scribus/pageitem.h
    branches/ScribusOIF/scribus/pageitem_regularpolygon.cpp
    branches/ScribusOIF/scribus/pdflib_core.cpp
    branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
    branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
    branches/ScribusOIF/scribus/plugins/gettext/docim/docim.cpp
    branches/ScribusOIF/scribus/plugins/import/svg/svgplugin.cpp
    branches/ScribusOIF/scribus/plugins/import/svg/svgplugin.h
    branches/ScribusOIF/scribus/plugins/svgexplugin/svgexplugin.cpp
    branches/ScribusOIF/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp
    branches/ScribusOIF/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp
    branches/ScribusOIF/scribus/plugins/tools/lenseffects/lenseffects.cpp
    branches/ScribusOIF/scribus/plugins/tools/pathconnect/pathconnect.cpp
    branches/ScribusOIF/scribus/plugins/tools/pathcut/pathcut.cpp
    branches/ScribusOIF/scribus/plugins/tools/pathfinder/pathfinder.cpp
    branches/ScribusOIF/scribus/plugins/tools/pathstroker/pathstroker.cpp
    branches/ScribusOIF/scribus/prefsmanager.cpp
    branches/ScribusOIF/scribus/prefsstructs.h
    branches/ScribusOIF/scribus/pslib.cpp
    branches/ScribusOIF/scribus/scpageoutput.cpp
    branches/ScribusOIF/scribus/scribus.cpp
    branches/ScribusOIF/scribus/scribusdoc.cpp
    branches/ScribusOIF/scribus/scribusstructs.h
    branches/ScribusOIF/scribus/scribusview.h
    branches/ScribusOIF/scribus/ui/modetoolbar.cpp
    branches/ScribusOIF/scribus/ui/outlinepalette.cpp
    branches/ScribusOIF/scribus/ui/polygonwidget.cpp
    branches/ScribusOIF/scribus/ui/polygonwidget.h
    branches/ScribusOIF/scribus/ui/polygonwidgetbase.ui
    branches/ScribusOIF/scribus/ui/polyprops.cpp
    branches/ScribusOIF/scribus/ui/polyprops.h
    branches/ScribusOIF/scribus/ui/propertiespalette.cpp
    branches/ScribusOIF/scribus/ui/propertiespalette_group.cpp
    branches/ScribusOIF/scribus/ui/propertiespalette_image.cpp
    branches/ScribusOIF/scribus/ui/propertiespalette_line.cpp
    branches/ScribusOIF/scribus/ui/propertiespalette_shape.cpp
    branches/ScribusOIF/scribus/ui/propertiespalette_text.cpp
    branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp
    branches/ScribusOIF/scribus/ui/propertywidget_line.cpp
    branches/ScribusOIF/scribus/ui/propertywidget_pos.cpp
    branches/ScribusOIF/scribus/ui/propertywidget_shape.cpp
    branches/ScribusOIF/scribus/util_math.cpp
    branches/ScribusOIF/scribus/util_math.h
    branches/ScribusOIF/win32/vc8/Scribus.vcproj

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/ScribusOIF/TRANSLATION
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/TRANSLATION

Modified: branches/ScribusOIF/resources/translations/po/scribus.nb_NO.ts
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/resources/translations/po/scribus.nb_NO.ts

Modified: branches/ScribusOIF/resources/versions/scribusversions.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/resources/versions/scribusversions.xml

Modified: branches/ScribusOIF/scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/CMakeLists.txt

Modified: branches/ScribusOIF/scribus/actionmanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/actionmanager.cpp

Modified: branches/ScribusOIF/scribus/canvas.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/canvas.h

Modified: branches/ScribusOIF/scribus/canvasmode.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/canvasmode.cpp

Modified: branches/ScribusOIF/scribus/canvasmode_create.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/canvasmode_create.cpp

Modified: branches/ScribusOIF/scribus/canvasmode_normal.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/canvasmode_normal.cpp

Modified: branches/ScribusOIF/scribus/pageitem.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/pageitem.cpp

Modified: branches/ScribusOIF/scribus/pageitem.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/pageitem.h

Modified: branches/ScribusOIF/scribus/pageitem_regularpolygon.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/pageitem_regularpolygon.cpp

Modified: branches/ScribusOIF/scribus/pdflib_core.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/pdflib_core.cpp

Modified: branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format.cpp

Modified: branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp

Modified: branches/ScribusOIF/scribus/plugins/gettext/docim/docim.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/plugins/gettext/docim/docim.cpp

Modified: branches/ScribusOIF/scribus/plugins/import/svg/svgplugin.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/plugins/import/svg/svgplugin.cpp

Modified: branches/ScribusOIF/scribus/plugins/import/svg/svgplugin.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/plugins/import/svg/svgplugin.h

Modified: branches/ScribusOIF/scribus/plugins/svgexplugin/svgexplugin.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/plugins/svgexplugin/svgexplugin.cpp

Modified: branches/ScribusOIF/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp

Modified: branches/ScribusOIF/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp

Modified: branches/ScribusOIF/scribus/plugins/tools/lenseffects/lenseffects.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/plugins/tools/lenseffects/lenseffects.cpp

Modified: branches/ScribusOIF/scribus/plugins/tools/pathconnect/pathconnect.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/plugins/tools/pathconnect/pathconnect.cpp

Modified: branches/ScribusOIF/scribus/plugins/tools/pathcut/pathcut.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/plugins/tools/pathcut/pathcut.cpp

Modified: branches/ScribusOIF/scribus/plugins/tools/pathfinder/pathfinder.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/plugins/tools/pathfinder/pathfinder.cpp

Modified: branches/ScribusOIF/scribus/plugins/tools/pathstroker/pathstroker.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/plugins/tools/pathstroker/pathstroker.cpp

Modified: branches/ScribusOIF/scribus/prefsmanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/prefsmanager.cpp

Modified: branches/ScribusOIF/scribus/prefsstructs.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/prefsstructs.h

Modified: branches/ScribusOIF/scribus/pslib.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/pslib.cpp

Modified: branches/ScribusOIF/scribus/scpageoutput.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/scpageoutput.cpp

Modified: branches/ScribusOIF/scribus/scribus.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/scribus.cpp

Modified: branches/ScribusOIF/scribus/scribusdoc.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/scribusdoc.cpp

Modified: branches/ScribusOIF/scribus/scribusstructs.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/scribusstructs.h

Modified: branches/ScribusOIF/scribus/scribusview.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/scribusview.h

Modified: branches/ScribusOIF/scribus/ui/modetoolbar.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/ui/modetoolbar.cpp

Modified: branches/ScribusOIF/scribus/ui/outlinepalette.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/ui/outlinepalette.cpp

Modified: branches/ScribusOIF/scribus/ui/polygonwidget.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/ui/polygonwidget.cpp

Modified: branches/ScribusOIF/scribus/ui/polygonwidget.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/ui/polygonwidget.h

Modified: branches/ScribusOIF/scribus/ui/polygonwidgetbase.ui
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/ui/polygonwidgetbase.ui

Modified: branches/ScribusOIF/scribus/ui/polyprops.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/ui/polyprops.cpp

Modified: branches/ScribusOIF/scribus/ui/polyprops.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/ui/polyprops.h

Modified: branches/ScribusOIF/scribus/ui/propertiespalette.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/ui/propertiespalette.cpp

Modified: branches/ScribusOIF/scribus/ui/propertiespalette_group.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/ui/propertiespalette_group.cpp

Modified: branches/ScribusOIF/scribus/ui/propertiespalette_image.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/ui/propertiespalette_image.cpp

Modified: branches/ScribusOIF/scribus/ui/propertiespalette_line.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/ui/propertiespalette_line.cpp

Modified: branches/ScribusOIF/scribus/ui/propertiespalette_shape.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/ui/propertiespalette_shape.cpp

Modified: branches/ScribusOIF/scribus/ui/propertiespalette_text.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/ui/propertiespalette_text.cpp

Modified: branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp

Modified: branches/ScribusOIF/scribus/ui/propertywidget_line.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/ui/propertywidget_line.cpp

Modified: branches/ScribusOIF/scribus/ui/propertywidget_pos.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/ui/propertywidget_pos.cpp

Modified: branches/ScribusOIF/scribus/ui/propertywidget_shape.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/ui/propertywidget_shape.cpp

Modified: branches/ScribusOIF/scribus/util_math.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/util_math.cpp

Modified: branches/ScribusOIF/scribus/util_math.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/scribus/util_math.h

Modified: branches/ScribusOIF/win32/vc8/Scribus.vcproj
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16222&path=/branches/ScribusOIF/win32/vc8/Scribus.vcproj

More information about the scribus-commit mailing list