diff -r 985e22966acb -r 3651a18f3703 libInit.cc
--- a/libInit.cc	Sat May 05 22:58:24 2012 +0100
+++ b/libInit.cc	Wed May 09 16:04:12 2012 +0100
@@ -1,9 +1,5 @@
 /*
-<<<<<<< .working
  * $Header$
-=======
- * $Header: /cvs/stx/stx/libbasic/libInit.cc,v 1.178 2012/03/01 16:04:03 stefan Exp $
->>>>>>> .merge-right.r10791
  *
  * DO NOT EDIT
  * automagically generated from the projectDefinition: stx_libbasic.
@@ -34,6 +30,7 @@
 _Autoload_Init(pass,__pRT__,snd);
 _Object_Init(pass,__pRT__,snd);
 _ProtoObject_Init(pass,__pRT__,snd);
+_AbstractDesktop_Init(pass,__pRT__,snd);
 _AbstractOperatingSystem_Init(pass,__pRT__,snd);
 _AbstractSourceFileReader_Init(pass,__pRT__,snd);
 _Annotation_Init(pass,__pRT__,snd);
@@ -327,12 +324,16 @@
 _Symbol_Init(pass,__pRT__,snd);
 _Unicode16String_Init(pass,__pRT__,snd);
 #ifdef UNIX
+_UnixDesktop_Init(pass,__pRT__,snd);
+_XDGDesktop_Init(pass,__pRT__,snd);
+_GNOMEDesktop_Init(pass,__pRT__,snd);
 _UnixFileDescriptorHandle_Init(pass,__pRT__,snd);
 _UnixFileHandle_Init(pass,__pRT__,snd);
 _UnixOperatingSystem_Init(pass,__pRT__,snd);
 #endif /* UNIX */
 #ifdef WIN32
 _Win32Process_Init(pass,__pRT__,snd);
+_WindowsDesktop_Init(pass,__pRT__,snd);
 _PCFilename_Init(pass,__pRT__,snd);
 _CharacterEncoderImplementations__MS_137Baltic_Init(pass,__pRT__,snd);
 _CharacterEncoderImplementations__MS_137Cyrillic_Init(pass,__pRT__,snd);
@@ -346,4 +347,3 @@
 
 __END_PACKAGE__();
 }
-