merge noncore/todayplugins/*

2 files changed, 1 insertions, 2 deletions

diff --git a/noncore/todayplugins/stockticker/stockticker/helpwindow.cpp b/noncore/todayplugins/stockticker/stockticker/helpwindow.cpp
index 23e78f2..2274402 100644
--- a/noncore/todayplugins/stockticker/stockticker/helpwindow.cpp
+++ b/noncore/todayplugins/stockticker/stockticker/helpwindow.cpp
@@ -1,5 +1,4 @@
 /****************************************************************************
-** $Id$
 **
 ** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
 **
diff --git a/noncore/todayplugins/weather/weatherpluginwidget.cpp b/noncore/todayplugins/weather/weatherpluginwidget.cpp
index 800fdcb..8440f20 100644
--- a/noncore/todayplugins/weather/weatherpluginwidget.cpp
+++ b/noncore/todayplugins/weather/weatherpluginwidget.cpp
@@ -49,7 +49,7 @@ WeatherPluginWidget::WeatherPluginWidget( QWidget *parent,  const char* name )
 
         weatherIcon = new QLabel( this );
         weatherIcon->setMaximumWidth( 32 );
-        QImage logo1 = Resource::loadImage( "todayweatherplugin/wait" );
+        QImage logo1 = Resource::loadImage( "Clock" );
         QPixmap pic;
         pic.convertFromImage( logo1 );
         weatherIcon->setPixmap( pic );