# HG changeset patch
# User Frank Benoit <benoit@tionex.de>
# Date 1220975073 -7200
# Node ID 3b8f773f35e49fc9760d1139821e59da34d62e4e
# Parent  cef27f6635734feffaf4735ca629e80117e55c4e# Parent  71ec57b4c8f387c74801f14f5ecf6f5ef561a7f3
merge

diff -r cef27f663573 -r 3b8f773f35e4 dsss.conf
--- a/dsss.conf	Tue Sep 09 17:44:11 2008 +0200
+++ b/dsss.conf	Tue Sep 09 17:44:33 2008 +0200
@@ -1,12 +1,7 @@
 
-[packageimport.d]
+
 [fixmodule.d]
 [collectionimp.d]
-
-[dwtx/draw2d]
-type=library
-buildflags+=-Jres
-
 [dwtx]
 type=library
 buildflags+=-Jres
diff -r cef27f663573 -r 3b8f773f35e4 dwtx/dwtxhelper/TimerTask.d
--- a/dwtx/dwtxhelper/TimerTask.d	Tue Sep 09 17:44:11 2008 +0200
+++ b/dwtx/dwtxhelper/TimerTask.d	Tue Sep 09 17:44:33 2008 +0200
@@ -1,6 +1,7 @@
 module dwtx.dwtxhelper.TimerTask;
 
 import tango.time.Time;
+import dwt.dwthelper.utils;
 import dwt.dwthelper.Runnable;
 import dwtx.dwtxhelper.Timer;
 
@@ -9,8 +10,10 @@
     package Time executionTime;
     package Timer timer;
 
-//     bool cancel(){
-//     }
+    bool cancel(){
+        implMissing( __FILE__, __LINE__ );
+        return false;
+    }
 
     abstract void run();