r16009 by jghali - merge trunk revisions up to r16002

[scribus-commit]

Author: jghali
Date: Sat Nov 27 02:19:52 2010
New Revision: 16009

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

Modified:
    branches/ScribusOIF/doc/en/contributions.html
    branches/ScribusOIF/doc/en/download.html
    branches/ScribusOIF/doc/en/importhints1.html
    branches/ScribusOIF/doc/en/psd.html
    branches/ScribusOIF/doc/en/toolbox5.html
    branches/ScribusOIF/resources/translations/po/scribus.fr.ts
    branches/ScribusOIF/scribus/canvasmode_edit.cpp
    branches/ScribusOIF/scribus/pageitem_latexframe.cpp
    branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format.cpp

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

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

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

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

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

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

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

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

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

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