summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-10-29 16:51:56 (UTC)
committer mickeyl <mickeyl>2003-10-29 16:51:56 (UTC)
commitf254437deda45d7cccf2ba3c27c5fe934af1fca7 (patch) (side-by-side diff)
tree0442cbcf4c32353d76a03f932706343b402229a9
parente8697a4281f7a265b69e6bf5253383c73a38626b (diff)
downloadopie-f254437deda45d7cccf2ba3c27c5fe934af1fca7.zip
opie-f254437deda45d7cccf2ba3c27c5fe934af1fca7.tar.gz
opie-f254437deda45d7cccf2ba3c27c5fe934af1fca7.tar.bz2
merge noncore/todayplugins/*
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/todayplugins/stockticker/stockticker/helpwindow.cpp1
-rw-r--r--noncore/todayplugins/weather/weatherpluginwidget.cpp2
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,4 +1,3 @@
/****************************************************************************
-** $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
@@ -50,5 +50,5 @@ 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 );