r16936 by jghali - merge trunk revisions up to r16919

[scribus-commit]

Author: jghali
Date: Fri Oct 28 18:19:44 2011
New Revision: 16936

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

Added:
    branches/ScribusOIF/win32/vc9/scribus-main/
    branches/ScribusOIF/win32/vc9/scribus-main/Scribus.rc
      - copied unchanged from r16740, branches/ScribusOIF/win32/vc9/Scribus.rc
    branches/ScribusOIF/win32/vc9/scribus-main/Scribus.vcproj
      - copied, changed from r16904, branches/ScribusOIF/win32/vc9/Scribus.vcproj
    branches/ScribusOIF/win32/vc9/scribus-main/about_builddate.inc
      - copied unchanged from r16740, branches/ScribusOIF/win32/vc9/about_builddate.inc
    branches/ScribusOIF/win32/vc9/scribus-main/resource.h
      - copied unchanged from r16740, branches/ScribusOIF/win32/vc9/resource.h
    branches/ScribusOIF/win32/vc9/scribus-main/scribusdoc.ico
      - copied unchanged from r16740, branches/ScribusOIF/win32/vc9/scribusdoc.ico
    branches/ScribusOIF/win32/vc9/scribus-main/scribusicon.ico
      - copied unchanged from r16740, branches/ScribusOIF/win32/vc9/scribusicon.ico
    branches/ScribusOIF/win32/vc9/scribus-main/scribuspch.cpp
    branches/ScribusOIF/win32/vc9/scribus-main/scribuspch.h
Removed:
    branches/ScribusOIF/win32/vc9/Scribus.rc
    branches/ScribusOIF/win32/vc9/Scribus.vcproj
    branches/ScribusOIF/win32/vc9/about_builddate.inc
    branches/ScribusOIF/win32/vc9/resource.h
    branches/ScribusOIF/win32/vc9/scribusdoc.ico
    branches/ScribusOIF/win32/vc9/scribusicon.ico
Modified:
    branches/ScribusOIF/win32/vc9/Scribus.sln

Modified: branches/ScribusOIF/win32/vc9/Scribus.sln
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16936&path=/branches/ScribusOIF/win32/vc9/Scribus.sln
==============================================================================
--- branches/ScribusOIF/win32/vc9/Scribus.sln (original)
+++ branches/ScribusOIF/win32/vc9/Scribus.sln Fri Oct 28 18:19:44 2011
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scribus-main", "Scribus.vcproj", "{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scribus-main", "scribus-main\Scribus.vcproj", "{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{7D5110DE-0EA4-43CD-882C-1B86DCE78454} = {7D5110DE-0EA4-43CD-882C-1B86DCE78454}
 		{50C264A1-2CE7-46A3-8C79-CBC714C49510} = {50C264A1-2CE7-46A3-8C79-CBC714C49510}