From f254437deda45d7cccf2ba3c27c5fe934af1fca7 Mon Sep 17 00:00:00 2001
From: mickeyl <mickeyl>
Date: Wed, 29 Oct 2003 16:51:56 +0000
Subject: merge noncore/todayplugins/*

---
(limited to 'noncore/todayplugins')

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 );
--
cgit v0.9.0.2