r16712 by jghali - merge trunk revisions up to r16711

scribus-commit scribus-commit at lists.scribus.net
Mon Jul 11 22:18:29 UTC 2011 

Author: jghali
Date: Mon Jul 11 22:18:28 2011
New Revision: 16712

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=16712
Log:
merge trunk revisions up to r16711

Removed:
    branches/ScribusOIF/scribus/plugins/scriptplugin/samples/pyqt_timer.py
    branches/ScribusOIF/scribus/plugins/scriptplugin/samples/startup_hook.py
Modified:
    branches/ScribusOIF/resources/templates/template.de.xml
    branches/ScribusOIF/resources/templates/template.hu.xml
    branches/ScribusOIF/resources/templates/template.xml
    branches/ScribusOIF/resources/translations/po/scribus.fr.ts
    branches/ScribusOIF/scribus/canvasmode_edit.cpp
    branches/ScribusOIF/scribus/filewatcher.cpp
    branches/ScribusOIF/scribus/filewatcher.h
    branches/ScribusOIF/scribus/gtgettext.cpp
    branches/ScribusOIF/scribus/nftrcreader.cpp
    branches/ScribusOIF/scribus/pageitem.cpp
    branches/ScribusOIF/scribus/pageitem.h
    branches/ScribusOIF/scribus/pageitem_textframe.cpp
    branches/ScribusOIF/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
    branches/ScribusOIF/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
    branches/ScribusOIF/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
    branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
    branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
    branches/ScribusOIF/scribus/plugins/import/ai/importai.cpp
    branches/ScribusOIF/scribus/plugins/import/wmf/wmfimport.cpp
    branches/ScribusOIF/scribus/plugins/import/wpg/importwpg.cpp
    branches/ScribusOIF/scribus/plugins/import/xfig/importxfig.cpp
    branches/ScribusOIF/scribus/plugins/saveastemplateplugin/satdialog.cpp
    branches/ScribusOIF/scribus/plugins/scriptplugin/pconsole.cpp
    branches/ScribusOIF/scribus/prefsmanager.cpp
    branches/ScribusOIF/scribus/scimage.cpp
    branches/ScribusOIF/scribus/scribus.cpp
    branches/ScribusOIF/scribus/scribusapp.cpp
    branches/ScribusOIF/scribus/scribusapp.h
    branches/ScribusOIF/scribus/scribusdoc.cpp
    branches/ScribusOIF/scribus/scribusdoc.h
    branches/ScribusOIF/scribus/scribusview.cpp
    branches/ScribusOIF/scribus/tests/testIndex.h
    branches/ScribusOIF/scribus/text/storytext.cpp
    branches/ScribusOIF/scribus/text/storytext.h
    branches/ScribusOIF/scribus/tocgenerator.cpp
    branches/ScribusOIF/scribus/ui/about.cpp
    branches/ScribusOIF/scribus/ui/nodeeditpalette.cpp

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

Modified: branches/ScribusOIF/resources/templates/template.de.xml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16712&path=/branches/ScribusOIF/resources/templates/template.de.xml

Modified: branches/ScribusOIF/resources/templates/template.hu.xml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16712&path=/branches/ScribusOIF/resources/templates/template.hu.xml

Modified: branches/ScribusOIF/resources/templates/template.xml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16712&path=/branches/ScribusOIF/resources/templates/template.xml

Modified: branches/ScribusOIF/resources/translations/po/scribus.fr.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16712&path=/branches/ScribusOIF/resources/translations/po/scribus.fr.ts

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

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

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

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

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

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

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

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

Modified: branches/ScribusOIF/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16712&path=/branches/ScribusOIF/scribus/plugins/fileloader/scribus12format/scribus12format.cpp

Modified: branches/ScribusOIF/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16712&path=/branches/ScribusOIF/scribus/plugins/fileloader/scribus134format/scribus134format.cpp

Modified: branches/ScribusOIF/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16712&path=/branches/ScribusOIF/scribus/plugins/fileloader/scribus13format/scribus13format.cpp

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

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

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

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

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

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

Modified: branches/ScribusOIF/scribus/plugins/saveastemplateplugin/satdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16712&path=/branches/ScribusOIF/scribus/plugins/saveastemplateplugin/satdialog.cpp

Modified: branches/ScribusOIF/scribus/plugins/scriptplugin/pconsole.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16712&path=/branches/ScribusOIF/scribus/plugins/scriptplugin/pconsole.cpp

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

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

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

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

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

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

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

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

Modified: branches/ScribusOIF/scribus/tests/testIndex.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16712&path=/branches/ScribusOIF/scribus/tests/testIndex.h

Modified: branches/ScribusOIF/scribus/text/storytext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16712&path=/branches/ScribusOIF/scribus/text/storytext.cpp

Modified: branches/ScribusOIF/scribus/text/storytext.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16712&path=/branches/ScribusOIF/scribus/text/storytext.h

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

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

Modified: branches/ScribusOIF/scribus/ui/nodeeditpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16712&path=/branches/ScribusOIF/scribus/ui/nodeeditpalette.cpp

More information about the scribus-commit mailing list