--- a/UnixOperatingSystem.st	Wed Apr 13 09:20:17 2016 +0100
+++ b/UnixOperatingSystem.st	Thu Apr 14 06:38:20 2016 +0200
@@ -989,7 +989,7 @@
 
 documentation
 "
-    this class realizes access to most (all ?) required operating system services;
+    this class realizes access to most (all?) required operating system services;
     some of it is very specific for unix, so do not depend on
     things available here in your applications
     - some may not be found in other OS's or be slightly different ...
@@ -1001,23 +1001,23 @@
 
     [Class variables:]
 
-	HostName        <String>        remembered hostname
-
-	DomainName      <String>        remembered domainname
-
-	SlowFork        <Boolean>       if set, fork and popen are avoided;
-					(more or less obsolete now)
-
-
-	CurrentDirectory <String>       remembered currentDirectories path
+        HostName        <String>        remembered hostname
+
+        DomainName      <String>        remembered domainname
+
+        SlowFork        <Boolean>       if set, fork and popen are avoided;
+                                        (more or less obsolete now)
+
+
+        CurrentDirectory <String>       remembered currentDirectories path
 
     [author:]
-	Claus Gittinger
+        Claus Gittinger
 
     [see also:]
-	OSProcessStatus
-	Filename Date Time
-	ExternalStream FileStream PipeStream Socket
+        OSProcessStatus
+        Filename Date Time
+        ExternalStream FileStream PipeStream Socket
 "
 !
 
@@ -5751,7 +5751,7 @@
      For nonexistent files, nil is returned."
 
     "could be implemented as:
-	(self infoOf:aPathName) accessed
+        (self infoOf:aPathName) accessed
     "
     |osSeconds i encodedPathName|
 
@@ -5759,29 +5759,29 @@
 
 %{
     if (__isStringLike(encodedPathName)) {
-	struct stat buf;
-	time_t mtime;
-	int ret;
+        struct stat buf;
+        time_t mtime;
+        int ret;
 
 # ifdef TRACE_STAT_CALLS
-	printf("stat on '%s' for timeOfLastAccess\n", __stringVal(encodedPathName));
-# endif
-	__BEGIN_INTERRUPTABLE__
-	do {
-	    ret = stat((char *) __stringVal(encodedPathName), &buf);
-	} while (ret < 0 && errno == EINTR);
-	__END_INTERRUPTABLE__
-	if (ret < 0) {
-	    @global(LastErrorNumber) = __mkSmallInteger(errno);
-	    RETURN (nil);
-	}
-	osSeconds = __MKUINT(buf.st_atime);
+        printf("stat on '%s' for timeOfLastAccess\n", __stringVal(encodedPathName));
+# endif
+        __BEGIN_INTERRUPTABLE__
+        do {
+            ret = stat((char *) __stringVal(encodedPathName), &buf);
+        } while (ret < 0 && errno == EINTR);
+        __END_INTERRUPTABLE__
+        if (ret < 0) {
+            @global(LastErrorNumber) = __mkSmallInteger(errno);
+            RETURN (nil);
+        }
+        osSeconds = __MKUINT(buf.st_atime);
     }
 %}.
     osSeconds notNil ifTrue:[^ Timestamp fromOSTime:(osSeconds * 1000)].
 
     i := self infoOf:aPathName.
-    i notNil ifTrue:[^ i accessed].
+    i notNil ifTrue:[^ i accessTime].
     ^ nil.
 
     "
@@ -5794,7 +5794,7 @@
      For nonexistent files, nil is returned."
 
     "could be implemented as:
-	(self infoOf:aPathName) modified
+        (self infoOf:aPathName) modified
     "
 
     |osSeconds i encodedPathName|
@@ -5802,29 +5802,29 @@
     encodedPathName := self encodePath:aPathName.
 %{
     if (__isStringLike(encodedPathName)) {
-	struct stat buf;
-	int ret;
-	time_t mtime;
+        struct stat buf;
+        int ret;
+        time_t mtime;
 
 # ifdef TRACE_STAT_CALLS
-	printf("stat on '%s' for timeOfLastChange\n", __stringVal(encodedPathName));
-# endif
-	__BEGIN_INTERRUPTABLE__
-	do {
-	    ret = stat((char *) __stringVal(encodedPathName), &buf);
-	} while (ret < 0 && errno == EINTR);
-	__END_INTERRUPTABLE__
-	if (ret < 0) {
-	    @global(LastErrorNumber) = __mkSmallInteger(errno);
-	    RETURN ( nil );
-	}
-	osSeconds = __MKUINT(buf.st_mtime);
+        printf("stat on '%s' for timeOfLastChange\n", __stringVal(encodedPathName));
+# endif
+        __BEGIN_INTERRUPTABLE__
+        do {
+            ret = stat((char *) __stringVal(encodedPathName), &buf);
+        } while (ret < 0 && errno == EINTR);
+        __END_INTERRUPTABLE__
+        if (ret < 0) {
+            @global(LastErrorNumber) = __mkSmallInteger(errno);
+            RETURN ( nil );
+        }
+        osSeconds = __MKUINT(buf.st_mtime);
     }
 %}.
     osSeconds notNil ifTrue:[^ Timestamp fromOSTime:(osSeconds * 1000)].
 
     i := self infoOf:aPathName.
-    i notNil ifTrue:[^ i modified].
+    i notNil ifTrue:[^ i modificationTime].
     ^ nil.
 
     "

--- a/UserPreferences.st	Wed Apr 13 09:20:17 2016 +0100
+++ b/UserPreferences.st	Thu Apr 14 06:38:20 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1998 by eXept Software AG
 	      All Rights Reserved
@@ -842,6 +840,8 @@
     "Modified: / 15-01-2012 / 14:26:53 / cg"
 ! !
 
+
+
 !UserPreferences methodsFor:'accessing-locale'!
 
 dateInputFormat
@@ -1138,18 +1138,17 @@
 
     className := self at: #changeSetBrowserClassName ifAbsent:[nil].
     className notNil ifTrue:[
-	class := Smalltalk at: className asSymbol.
-	class notNil ifTrue:[ ^ class ].
+        class := Smalltalk at: className asSymbol.
+        class notNil ifTrue:[ ^ class ].
     ].
 
     "Original code"
     ^ ChangeSetBrowser.
-    "/^ Tools::ChangeSetBrowser2 ? ChangeSetBrowser
-
-    self useNewChangeSetBrowser ifTrue:[
-	^ Tools::ChangeSetBrowser2 ? ChangeSetBrowser
-    ].
-    ^ ChangeSetBrowser ? Tools::ChangeSetBrowser2
+
+"/    self useNewChangeSetBrowser ifTrue:[
+"/        ^ Tools::ChangeSetBrowser2 ? ChangeSetBrowser
+"/    ].
+"/    ^ ChangeSetBrowser ? Tools::ChangeSetBrowser2
 
     "
      self current changeSetBrowserClass