Merge branch 'io-master'

Conflicts:
	.gitignore
	Build
	Changelog.txt

diff --cc .gitignore
index 82b1d620d50afd20e80a43f73c10c2727cf0261a,c200d8fd170f59c1d08a9fccbf43918180474b21..0c896d67428f0882191675ce24a963cbf790d05b
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,15 -1,10 +1,13 @@@
  /.deps
  /.options.*
  /.profile
 +/arm
  /debug
 -/libmspio.a
 -/libmspio.so
 -/mspio.pc
 +/grep
 +/libmspcore.a
 +/libmspcore.so
- /libmspstrings.a
- /libmspstrings.so
 +/mspcore.pc
  /release
  /temp
 +/transcode
  /win32

diff --cc Build
index e1f3fd7dc5bffe5140a0bf7449ce1d11716ff788,32d717dd6b38aba17d575aa982ba0afa41bed5df..cdd83c4cdfcd72b51f580490990e20e45243afff
--- 1/Build
--- 2/Build
+++ b/Build
@@@ -1,65 -1,23 +1,72 @@@
  /* $Id$ */
  
 -package "mspio"
 +package "mspcore"
  {
        version "1.1";
 -      description "Object-oriented input/output library";
 +      description "Mikkosoft Productions core library";
  
 -      require "mspstrings";
 -      require "mspcore";
        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;
 +      };
  
 -              source "source";
+       headers "msp/io"
+       {
 -      library "mspio"
++              source "src/io";
+               install true;
+       };
+ 
 +      library "mspcore"
        {
 -              source "source";
 +              source "source/core";
 +              source "source/debug";
 +              source "source/time";
 +              source "source/strings";
 +              source "source/stringcodec";
++              source "source/io";
                install true;
        };
  

diff --cc Changelog.txt
index a9d3619be45d92025cc30dc98f8ffef0c1a3015e,5225d219c4b9604403cc4bc978506705bd3e0202..498e9ff7422a35c8b230cda27da1d413c2ef001a
--- 1/Changelog.txt
--- 2/Changelog.txt
+++ b/Changelog.txt
@@@ -1,32 -1,11 +1,42 @@@
- ($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
 +
 -
 -($Id$)
++== 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