# HG changeset patch
# User Frank Benoit <benoit@tionex.de>
# Date 1238873917 -7200
# Node ID 5f6d9bb33a536cc3aeb26c3cfd9b0ebbb605f119
# Parent  5b585873fec2fc65408ef07efb89795662ff808d# Parent  4bffbf81e2d6e28890bb9480a3c1147f590dce91
merge

diff -r 4bffbf81e2d6 -r 5f6d9bb33a53 dwt/dwthelper/InflaterInputStream.d
--- a/dwt/dwthelper/InflaterInputStream.d	Fri Mar 20 21:00:06 2009 +0100
+++ b/dwt/dwthelper/InflaterInputStream.d	Sat Apr 04 21:38:37 2009 +0200
@@ -11,11 +11,7 @@
         pragma(link,"zlib");
     }
 }
-version(TANGOSVN){
-    import tango.io.device.Conduit;
-} else {
-    import tango.io.Conduit;
-}
+import tango.io.device.Conduit;
 
 class InputStreamWrapper : tango.io.model.IConduit.InputStream {
 
diff -r 4bffbf81e2d6 -r 5f6d9bb33a53 dwt/dwthelper/utils.d
--- a/dwt/dwthelper/utils.d	Fri Mar 20 21:00:06 2009 +0100
+++ b/dwt/dwthelper/utils.d	Sat Apr 04 21:38:37 2009 +0200
@@ -485,8 +485,8 @@
     return res.length;
 }
 
-alias tango.text.convert.Utf.toString16 toString16;
-alias tango.text.convert.Utf.toString toString;
+//alias tango.text.convert.Utf.toString16 toString16;
+//alias tango.text.convert.Utf.toString toString;
 
 int toAbsoluteCodePointStartOffset( String str, int index ){
     //getDwtLogger().trace( "str={}, str.length={}, index={}", str, str.length, index );