Merge branch 'fs-master'

Conflicts:
	.gitignore
	Build
	Changelog.txt

diff --cc Build
index 740887bdfbda393f1e507a5b63fe14885cfab6be,b44b8eba407f7cf9cca267bbc982a409f115ee1d..a4758f420dd20e11cb253648648911079ee5acba
--- 1/Build
--- 2/Build
+++ b/Build
@@@ -1,72 -1,21 +1,79 @@@
  /* $Id$ */
  
 -package "mspfs"
 +package "mspcore"
  {
        version "1.1";
 -      description "Filesystem utilities";
 +      description "Mikkosoft Productions core library";
  
 -      require "mspstrings";
 +      require "sigc++-2.0";
 +      if "arch!=win32"
 +      {
 +              build_info
 +              {
 +                      library "pthread";
 +              };
 +      };
 +      if "arch=linux"
 +      {
 +              build_info
 +              {
 +                      library "dl";
 +              };
 +      };
 +
 +      feature "exception_backtrace" "Generate a backtrace when an exception is thrown.";
 +
 +      headers "msp/core"
 +      {
 +              source "source/core";
 +              install true;
 +      };
 +
 +      headers "msp/time"
 +      {
 +              source "source/time";
 +              install true;
 +      };
 +
 +      headers "msp/debug"
 +      {
 +              source "source/debug";
 +              install true;
 +      };
 +
 +      headers "msp/strings"
 +      {
 +              source "source/strings";
 +              install true;
 +      };
 +
 +      headers "msp/stringcodec"
 +      {
 +              source "source/stringcodec";
 +              install true;
 +      };
 +
 +      headers "msp/io"
 +      {
 +              source "source/io";
 +              install true;
 +      };
  
 -      library "mspfs"
+       headers "msp/fs"
+       {
+               source "source/fs";
+               install true;
+       };
+ 
 +      library "mspcore"
        {
 +              source "source/core";
 +              source "source/debug";
 +              source "source/time";
 +              source "source/strings";
 +              source "source/stringcodec";
 +              source "source/io";
+               source "source/fs";
                install true;
        };
  

diff --cc Changelog.txt
index 498e9ff7422a35c8b230cda27da1d413c2ef001a,e944ff07d391e63005e35ee491344e1c7c930309..c1e8def291266763f14f6071d560a2b8602081a4
--- 1/Changelog.txt
--- 2/Changelog.txt
+++ b/Changelog.txt
@@@ -1,42 -1,14 +1,57 @@@
 -
 -($Id$)
 +2.0
 +
 +== Changes from pre-2.0 mspcore ==
 +
 +1.1
 +* Time zone support
 +* Some more time operations
 +* Bugfixes
 +  - Compatibility fixes for FreeBSD and 64-bit systems
 +  - Proper handling of string arguments with spaces in GetOpt
 +  - DateTime addition fixes
 +  - Timer no longer drops duplicate timeouts
 +
 +1.0
 +* First released version
 +
 +== Changes from pre-2.0 mspstrings ==
 +
 +1.1
 +* Codec autodetection
 +* lexical_cast rewritten from scratch
 +* Some new utility functions
 +* Bugfixes
 +  - 64-bit compatibility
 +  - Don't generate invalid octal escape sequences
 +  - UTF-8 decoder now passes the UTF-8 test file
 +  - Regex fixes
 +
 +1.0
 +* First released version
 +
 +== Changes from pre-2.0 mspio ==
 +
 +1.1
 +* Filter class makes adding filters easier
 +* Memory class enables I/O from/to memory buffers
 +* Console size can be queried
 +* Bugfixes
 +  - Don't consider an empty set for poll an error
 +
 +1.0
 +* First released version
++
++== Changes from pre-2.0 mspfs ==
++
+ 1.1
+ * Always start relative paths with a dot
+ * Bugfixes
+   - Fix 64-bit compilation
+ 
+ 1.0.1
+ * Bugfixes
+   - Make dirname behave sensibly for single-component paths
+   - Fix win32 compilation
+ 
+ 1.0
+ * First release