This is the merged Qtopia Clock with our changes included

-Seperate Clock, StopWatch, Alarm
-Allow starting stopping the stop watch by QCOP
-Allow Daily alarms
-Call OpiePlayer on resume

1 files changed, 2 insertions, 6 deletions

diff --git a/noncore/tools/clock/main.cpp b/noncore/tools/clock/main.cpp
index 237d9f0..380bfeb 100644
--- a/noncore/tools/clock/main.cpp
+++ b/noncore/tools/clock/main.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
@@ -19,10 +19,6 @@
 **********************************************************************/
 
 #include "clock.h"
-
 #include <opie2/oapplicationfactory.h>
-
-
-using namespace Opie::Core;
 using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<Clock> )