r16437 by jghali - merge trunk revisions up to r16416

[scribus-commit]

Author: jghali
Date: Wed Mar  9 20:04:43 2011
New Revision: 16437

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

Added:
    branches/ScribusOIF/cmake/modules/FindHYPHEN.cmake
      - copied unchanged from r16416, trunk/Scribus/cmake/modules/FindHYPHEN.cmake
Modified:
    branches/ScribusOIF/AUTHORS
    branches/ScribusOIF/Scribus.app/Contents/Info.plist
    branches/ScribusOIF/TRANSLATION
    branches/ScribusOIF/doc/en/readme.html
    branches/ScribusOIF/doc/en/scribuscopyright.html
    branches/ScribusOIF/resources/translations/po/scribus.hu.ts
    branches/ScribusOIF/resources/translations/po/scribus.zh_CN.ts
    branches/ScribusOIF/scribus/canvas.cpp
    branches/ScribusOIF/scribus/canvasmode.cpp
    branches/ScribusOIF/scribus/canvasmode_nodeedit.cpp
    branches/ScribusOIF/scribus/desaxe/saxXML.cpp
    branches/ScribusOIF/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
    branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
    branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
    branches/ScribusOIF/scribus/plugins/scriptplugin/cmdgetprop.cpp
    branches/ScribusOIF/scribus/plugins/scriptplugin/scripts/Autoquote.py
    branches/ScribusOIF/scribus/scribus.cpp
    branches/ScribusOIF/scribus/scribusdoc.cpp
    branches/ScribusOIF/scribus/scribusdoc.h
    branches/ScribusOIF/scribus/ui/about.cpp
    branches/ScribusOIF/scribus/ui/nodeeditpalette.cpp
    branches/ScribusOIF/scribus/ui/storyeditor.cpp
    branches/ScribusOIF/scribus/ui/stylemanager.cpp
    branches/ScribusOIF/scribus/undomanager.cpp

[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=16437&path=/branches/ScribusOIF/AUTHORS

Modified: branches/ScribusOIF/Scribus.app/Contents/Info.plist
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16437&path=/branches/ScribusOIF/Scribus.app/Contents/Info.plist

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

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

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

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

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

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

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

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

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

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

Modified: branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16437&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=16437&path=/branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp

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

Modified: branches/ScribusOIF/scribus/plugins/scriptplugin/scripts/Autoquote.py
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16437&path=/branches/ScribusOIF/scribus/plugins/scriptplugin/scripts/Autoquote.py

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

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

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

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

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

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

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

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