r15926 by jghali - merge trunk revisions up to r15925

scribus-commit scribus-commit at lists.scribus.net
Fri Nov 19 17:19:20 CET 2010 

Author: jghali
Date: Fri Nov 19 16:19:19 2010
New Revision: 15926

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

Added:
    branches/ScribusOIF/resources/dicts/README_hyph_de_CH.txt
      - copied unchanged from r15918, trunk/Scribus/resources/dicts/README_hyph_de_CH.txt
    branches/ScribusOIF/resources/dicts/README_hyph_de_DE.txt
      - copied unchanged from r15918, trunk/Scribus/resources/dicts/README_hyph_de_DE.txt
    branches/ScribusOIF/resources/dicts/hyph_de_CH.dic
      - copied unchanged from r15918, trunk/Scribus/resources/dicts/hyph_de_CH.dic
    branches/ScribusOIF/resources/swatches/AFNOR_X_08-002.xml
      - copied unchanged from r15918, trunk/Scribus/resources/swatches/AFNOR_X_08-002.xml
    branches/ScribusOIF/resources/templates/template.hu.xml
      - copied unchanged from r15918, trunk/Scribus/resources/templates/template.hu.xml
Modified:
    branches/ScribusOIF/doc/en/color3.html
    branches/ScribusOIF/doc/en/color4.html
    branches/ScribusOIF/doc/en/color8.html
    branches/ScribusOIF/resources/dicts/README_de_1901.txt
    branches/ScribusOIF/resources/dicts/hyph_de.dic
    branches/ScribusOIF/resources/swatches/AS_2007S-1996.xml
    branches/ScribusOIF/resources/swatches/BS_381C.xml
    branches/ScribusOIF/resources/swatches/BS_4800.xml
    branches/ScribusOIF/resources/swatches/CrayonTM.xml
    branches/ScribusOIF/resources/swatches/GCMI_Colors.xml
    branches/ScribusOIF/resources/swatches/JIS_8721.xml
    branches/ScribusOIF/resources/swatches/Japanese_Traditional.xml
    branches/ScribusOIF/resources/swatches/Munsell_Soil_Colors.xml
    branches/ScribusOIF/resources/swatches/NBS-ISCC_Colours.xml
    branches/ScribusOIF/resources/swatches/Resene/Resene_BS2660_101.xml
    branches/ScribusOIF/resources/swatches/Resene/Resene_BS5252_2008.xml
    branches/ScribusOIF/resources/swatches/Resene/Resene_Decks_Paths_2009.xml
    branches/ScribusOIF/resources/swatches/Resene/Resene_Heritage_2008.xml
    branches/ScribusOIF/resources/swatches/Resene/Resene_Karen_Walker_2008.xml
    branches/ScribusOIF/resources/swatches/Resene/Resene_KidzColour_2008.xml
    branches/ScribusOIF/resources/swatches/Resene/Resene_Multi-Finish.xml
    branches/ScribusOIF/resources/swatches/Resene/Resene_Summit_Roof_2010.xml
    branches/ScribusOIF/resources/swatches/Resene/Resene_The_Range_2011-12.xml
    branches/ScribusOIF/resources/swatches/Resene/Resene_The_Range_WandN_2010.xml
    branches/ScribusOIF/resources/swatches/Scribus_Basic.xml
    branches/ScribusOIF/resources/swatches/Scribus_Gnome.xml
    branches/ScribusOIF/resources/swatches/Scribus_OpenOffice.xml
    branches/ScribusOIF/resources/swatches/Scribus_SVG.xml
    branches/ScribusOIF/resources/swatches/Scribus_Splash.xml
    branches/ScribusOIF/resources/swatches/Scribus_X11.xml
    branches/ScribusOIF/resources/swatches/Scribus_X11Grey.xml
    branches/ScribusOIF/resources/swatches/Scribus_Xfig.xml
    branches/ScribusOIF/resources/swatches/Standardised_Rock_Colours.xml
    branches/ScribusOIF/resources/swatches/Tango.xml
    branches/ScribusOIF/resources/swatches/US_FS_595.xml
    branches/ScribusOIF/resources/templates/CMakeLists.txt
    branches/ScribusOIF/resources/translations/po/scribus.hu.ts
    branches/ScribusOIF/scribus/plugins/import/wmf/wmfimport.cpp
    branches/ScribusOIF/scribus/prefsmanager.cpp
    branches/ScribusOIF/scribus/sccolor.cpp
    branches/ScribusOIF/scribus/sccolor.h
    branches/ScribusOIF/scribus/scribusdoc.cpp
    branches/ScribusOIF/scribus/ui/paintmanager.cpp
    branches/ScribusOIF/win32/vc8/Scribus-build.vsprops

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

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

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

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

Modified: branches/ScribusOIF/resources/dicts/README_de_1901.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/dicts/README_de_1901.txt

Modified: branches/ScribusOIF/resources/dicts/hyph_de.dic
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/dicts/hyph_de.dic

Modified: branches/ScribusOIF/resources/swatches/AS_2007S-1996.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/AS_2007S-1996.xml

Modified: branches/ScribusOIF/resources/swatches/BS_381C.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/BS_381C.xml

Modified: branches/ScribusOIF/resources/swatches/BS_4800.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/BS_4800.xml

Modified: branches/ScribusOIF/resources/swatches/CrayonTM.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/CrayonTM.xml

Modified: branches/ScribusOIF/resources/swatches/GCMI_Colors.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/GCMI_Colors.xml

Modified: branches/ScribusOIF/resources/swatches/JIS_8721.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/JIS_8721.xml

Modified: branches/ScribusOIF/resources/swatches/Japanese_Traditional.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/Japanese_Traditional.xml

Modified: branches/ScribusOIF/resources/swatches/Munsell_Soil_Colors.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/Munsell_Soil_Colors.xml

Modified: branches/ScribusOIF/resources/swatches/NBS-ISCC_Colours.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/NBS-ISCC_Colours.xml

Modified: branches/ScribusOIF/resources/swatches/Resene/Resene_BS2660_101.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/Resene/Resene_BS2660_101.xml

Modified: branches/ScribusOIF/resources/swatches/Resene/Resene_BS5252_2008.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/Resene/Resene_BS5252_2008.xml

Modified: branches/ScribusOIF/resources/swatches/Resene/Resene_Decks_Paths_2009.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/Resene/Resene_Decks_Paths_2009.xml

Modified: branches/ScribusOIF/resources/swatches/Resene/Resene_Heritage_2008.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/Resene/Resene_Heritage_2008.xml

Modified: branches/ScribusOIF/resources/swatches/Resene/Resene_Karen_Walker_2008.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/Resene/Resene_Karen_Walker_2008.xml

Modified: branches/ScribusOIF/resources/swatches/Resene/Resene_KidzColour_2008.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/Resene/Resene_KidzColour_2008.xml

Modified: branches/ScribusOIF/resources/swatches/Resene/Resene_Multi-Finish.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/Resene/Resene_Multi-Finish.xml

Modified: branches/ScribusOIF/resources/swatches/Resene/Resene_Summit_Roof_2010.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/Resene/Resene_Summit_Roof_2010.xml

Modified: branches/ScribusOIF/resources/swatches/Resene/Resene_The_Range_2011-12.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/Resene/Resene_The_Range_2011-12.xml

Modified: branches/ScribusOIF/resources/swatches/Resene/Resene_The_Range_WandN_2010.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/Resene/Resene_The_Range_WandN_2010.xml

Modified: branches/ScribusOIF/resources/swatches/Scribus_Basic.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/Scribus_Basic.xml

Modified: branches/ScribusOIF/resources/swatches/Scribus_Gnome.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/Scribus_Gnome.xml

Modified: branches/ScribusOIF/resources/swatches/Scribus_OpenOffice.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/Scribus_OpenOffice.xml

Modified: branches/ScribusOIF/resources/swatches/Scribus_SVG.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/Scribus_SVG.xml

Modified: branches/ScribusOIF/resources/swatches/Scribus_Splash.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/Scribus_Splash.xml

Modified: branches/ScribusOIF/resources/swatches/Scribus_X11.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/Scribus_X11.xml

Modified: branches/ScribusOIF/resources/swatches/Scribus_X11Grey.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/Scribus_X11Grey.xml

Modified: branches/ScribusOIF/resources/swatches/Scribus_Xfig.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/Scribus_Xfig.xml

Modified: branches/ScribusOIF/resources/swatches/Standardised_Rock_Colours.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/Standardised_Rock_Colours.xml

Modified: branches/ScribusOIF/resources/swatches/Tango.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/Tango.xml

Modified: branches/ScribusOIF/resources/swatches/US_FS_595.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/resources/swatches/US_FS_595.xml

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

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

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

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

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

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

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

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

Modified: branches/ScribusOIF/win32/vc8/Scribus-build.vsprops
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15926&path=/branches/ScribusOIF/win32/vc8/Scribus-build.vsprops

More information about the scribus-commit mailing list