# HG changeset patch
# User Frank Benoit <benoit@tionex.de>
# Date 1220830690 -7200
# Node ID 71ec57b4c8f387c74801f14f5ecf6f5ef561a7f3
# Parent  20cdc983a4116d57b37af87dc93ac7a6d45c1433# Parent  e5dd0081ccba178b15214c9771cb2b46b361aebc
merge

diff -r e5dd0081ccba -r 71ec57b4c8f3 dsss.conf
--- a/dsss.conf	Mon Sep 08 01:01:30 2008 +0200
+++ b/dsss.conf	Mon Sep 08 01:38:10 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 e5dd0081ccba -r 71ec57b4c8f3 dwtx/dwtxhelper/TimerTask.d
--- a/dwtx/dwtxhelper/TimerTask.d	Mon Sep 08 01:01:30 2008 +0200
+++ b/dwtx/dwtxhelper/TimerTask.d	Mon Sep 08 01:38:10 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();