From: Simo Puonti <Simo.Puonti@ixonos.com>
Date: Wed, 27 May 2009 07:37:46 +0000 (+0300)
Subject: Merge branch 'master_merge' into dev_puontsi
X-Git-Url: https://vcs.maemo.org/git/?p=qtmeetings;a=commitdiff_plain;h=04e62b2c2bf80b887318399b81604fe5db315a5d

Merge branch 'master_merge' into dev_puontsi

Conflicts:
	src/Domain/Configuration/Configuration.cpp
	src/Domain/Configuration/DateTimeSettings.cpp
---

04e62b2c2bf80b887318399b81604fe5db315a5d
diff --cc src/Domain/Configuration/DateTimeSettings.cpp
index 21c3c6e,6cf5f1c..b885e6b
--- a/src/Domain/Configuration/DateTimeSettings.cpp
+++ b/src/Domain/Configuration/DateTimeSettings.cpp
@@@ -82,5 -113,8 +113,8 @@@ void DateTimeSettings::setDayOfWeek(con
  
  QString DateTimeSettings::dayOfWeek()
  {
+ 
+ 	qDebug() << "DateTimeSettings::dayOfWeek: " +this->iDayOfWeek;
+ 
 -	return (this->iDayOfWeek);
 +	return(this->iDayOfWeek);
  }