r16033 by jghali - merge trunk revisions up to r16031

scribus-commit scribus-commit at lists.scribus.net
Mon Nov 29 01:57:09 CET 2010 

Author: jghali
Date: Mon Nov 29 00:57:08 2010
New Revision: 16033

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

Removed:
    branches/ScribusOIF/scribus/ui/patterndialog.cpp
    branches/ScribusOIF/scribus/ui/patterndialog.h
    branches/ScribusOIF/scribus/ui/patterndialog.ui
Modified:
    branches/ScribusOIF/AUTHORS
    branches/ScribusOIF/TRANSLATION
    branches/ScribusOIF/doc/en/about2.html
    branches/ScribusOIF/doc/en/importhints1.html
    branches/ScribusOIF/doc/en/readme.html
    branches/ScribusOIF/resources/translations/po/scribus.el.ts
    branches/ScribusOIF/scribus/CMakeLists.txt
    branches/ScribusOIF/scribus/actionmanager.cpp
    branches/ScribusOIF/scribus/canvasmode.cpp
    branches/ScribusOIF/scribus/canvasmode.h
    branches/ScribusOIF/scribus/canvasmode_edit.cpp
    branches/ScribusOIF/scribus/canvasmode_normal.cpp
    branches/ScribusOIF/scribus/colorsetmanager.cpp
    branches/ScribusOIF/scribus/colorsetmanager.h
    branches/ScribusOIF/scribus/loadsaveplugin.cpp
    branches/ScribusOIF/scribus/loadsaveplugin.h
    branches/ScribusOIF/scribus/pageitem.cpp
    branches/ScribusOIF/scribus/pluginmanager.cpp
    branches/ScribusOIF/scribus/plugins/barcodegenerator/barcodegenerator.cpp
    branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
    branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format.h
    branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
    branches/ScribusOIF/scribus/plugins/import/ai/importai.cpp
    branches/ScribusOIF/scribus/plugins/import/cgm/importcgm.cpp
    branches/ScribusOIF/scribus/plugins/import/cvg/importcvg.cpp
    branches/ScribusOIF/scribus/plugins/import/drw/importdrw.cpp
    branches/ScribusOIF/scribus/plugins/import/oodraw/oodrawimp.cpp
    branches/ScribusOIF/scribus/plugins/import/pct/importpct.cpp
    branches/ScribusOIF/scribus/plugins/import/ps/importps.cpp
    branches/ScribusOIF/scribus/plugins/import/svg/svgplugin.cpp
    branches/ScribusOIF/scribus/plugins/import/wmf/wmfimport.cpp
    branches/ScribusOIF/scribus/plugins/import/wpg/importwpg.cpp
    branches/ScribusOIF/scribus/plugins/import/xar/importxar.cpp
    branches/ScribusOIF/scribus/plugins/import/xfig/importxfig.cpp
    branches/ScribusOIF/scribus/prefsmanager.cpp
    branches/ScribusOIF/scribus/prefsstructs.h
    branches/ScribusOIF/scribus/scpattern.cpp
    branches/ScribusOIF/scribus/scpattern.h
    branches/ScribusOIF/scribus/scribus.cpp
    branches/ScribusOIF/scribus/scribus.h
    branches/ScribusOIF/scribus/scribusdoc.cpp
    branches/ScribusOIF/scribus/scribusdoc.h
    branches/ScribusOIF/scribus/scribusview.cpp
    branches/ScribusOIF/scribus/scribusview.h
    branches/ScribusOIF/scribus/scribuswin.cpp
    branches/ScribusOIF/scribus/ui/about.cpp
    branches/ScribusOIF/scribus/ui/paintmanager.cpp
    branches/ScribusOIF/scribus/ui/paintmanager.h
    branches/ScribusOIF/scribus/ui/symbolpalette.cpp
    branches/ScribusOIF/scribus/ui/symbolpalette.h
    branches/ScribusOIF/win32/vc8/Scribus.vcproj

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

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

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

Modified: branches/ScribusOIF/doc/en/about2.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16033&path=/branches/ScribusOIF/doc/en/about2.html

Modified: branches/ScribusOIF/doc/en/importhints1.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16033&path=/branches/ScribusOIF/doc/en/importhints1.html

Modified: branches/ScribusOIF/doc/en/readme.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16033&path=/branches/ScribusOIF/doc/en/readme.html

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Modified: branches/ScribusOIF/scribus/plugins/import/ai/importai.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16033&path=/branches/ScribusOIF/scribus/plugins/import/ai/importai.cpp

Modified: branches/ScribusOIF/scribus/plugins/import/cgm/importcgm.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16033&path=/branches/ScribusOIF/scribus/plugins/import/cgm/importcgm.cpp

Modified: branches/ScribusOIF/scribus/plugins/import/cvg/importcvg.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16033&path=/branches/ScribusOIF/scribus/plugins/import/cvg/importcvg.cpp

Modified: branches/ScribusOIF/scribus/plugins/import/drw/importdrw.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16033&path=/branches/ScribusOIF/scribus/plugins/import/drw/importdrw.cpp

Modified: branches/ScribusOIF/scribus/plugins/import/oodraw/oodrawimp.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16033&path=/branches/ScribusOIF/scribus/plugins/import/oodraw/oodrawimp.cpp

Modified: branches/ScribusOIF/scribus/plugins/import/pct/importpct.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16033&path=/branches/ScribusOIF/scribus/plugins/import/pct/importpct.cpp

Modified: branches/ScribusOIF/scribus/plugins/import/ps/importps.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16033&path=/branches/ScribusOIF/scribus/plugins/import/ps/importps.cpp

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

Modified: branches/ScribusOIF/scribus/plugins/import/wmf/wmfimport.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16033&path=/branches/ScribusOIF/scribus/plugins/import/wmf/wmfimport.cpp

Modified: branches/ScribusOIF/scribus/plugins/import/wpg/importwpg.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16033&path=/branches/ScribusOIF/scribus/plugins/import/wpg/importwpg.cpp

Modified: branches/ScribusOIF/scribus/plugins/import/xar/importxar.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16033&path=/branches/ScribusOIF/scribus/plugins/import/xar/importxar.cpp

Modified: branches/ScribusOIF/scribus/plugins/import/xfig/importxfig.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16033&path=/branches/ScribusOIF/scribus/plugins/import/xfig/importxfig.cpp

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

More information about the scribus-commit mailing list