r16843 by craig - #10263: Apply patch for master page import dialog

[scribus-commit]

Author: craig
Date: Sun Sep 18 21:45:02 2011
New Revision: 16843

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=16843
Log:
#10263: Apply patch for master page import dialog

Modified:
    branches/Version135/Scribus/scribus/about.cpp
    branches/Version135/Scribus/scribus/mergedoc.cpp

Modified: branches/Version135/Scribus/scribus/about.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16843&path=/branches/Version135/Scribus/scribus/about.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/about.cpp (original)
+++ branches/Version135/Scribus/scribus/about.cpp Sun Sep 18 21:45:02 2011
@@ -114,8 +114,8 @@
 	buildID = new QLabel( tab );
 	buildID->setAlignment(Qt::AlignCenter);
 	buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
-	QString BUILD_DAY = "11";
-	QString BUILD_MONTH = CommonStrings::august;
+	QString BUILD_DAY = "18";
+	QString BUILD_MONTH = CommonStrings::september;
 	QString BUILD_YEAR = "2011";
 	QString BUILD_TIME = "";
 	QString BUILD_TZ = "";

Modified: branches/Version135/Scribus/scribus/mergedoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16843&path=/branches/Version135/Scribus/scribus/mergedoc.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/mergedoc.cpp (original)
+++ branches/Version135/Scribus/scribus/mergedoc.cpp Sun Sep 18 21:45:02 2011
@@ -60,7 +60,7 @@
 		masterPageNameData = new ScComboBox(this);
 		masterPageNameData->setEnabled(false);
 		importPageLabel->setBuddy( masterPageNameData );
-		fromInfoLayout->addWidget( masterPageNameData, 1, 1 );
+		fromInfoLayout->addWidget( masterPageNameData, 1, 1, 1, 2);
 	}
 	else
 	{