Merge branch 'strings-master'

Conflicts:
	.gitignore
	Build
	Changelog.txt

diff --cc .gitignore
index ae72e46c4fbbb910443f6530fe5f3bf3c455ca28,6191adc25630e161d8038cfe0a6f431c8f58bccd..82b1d620d50afd20e80a43f73c10c2727cf0261a
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,12 -1,13 +1,15 @@@
  /.deps
  /.options.*
  /.profile
 +/arm
  /debug
 -/mspstrings.pc
+ /grep
 +/libmspcore.a
 +/libmspcore.so
+ /libmspstrings.a
+ /libmspstrings.so
 +/mspcore.pc
  /release
  /temp
+ /transcode
  /win32
--

diff --cc Build
index 359f6b197204d1a63489e221ace0c36cb27ac1f3,06545dc50a21490049519164b0f194ce3edb1c74..e1f3fd7dc5bffe5140a0bf7449ce1d11716ff788
--- 1/Build
--- 2/Build
+++ b/Build
@@@ -1,54 -1,49 +1,86 @@@
 -// $Id$
 +/* $Id$ */
  
 -package "mspstrings"
 +package "mspcore"
  {
        version "1.1";
 -      description "String utilities library";
 +      description "Mikkosoft Productions core library";
  
 -      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;
 +      };
  
 -      library "mspstrings"
+       headers "msp/strings"
+       {
+               source "source/strings";
+               install true;
+       };
+ 
+       headers "msp/stringcodec"
+       {
+               source "source/stringcodec";
+               install true;
+       };
+ 
 +      library "mspcore"
        {
 +              source "source/core";
 +              source "source/debug";
 +              source "source/time";
+               source "source/strings";
+               source "source/stringcodec";
                install true;
        };
  
 -                      library "mspstrings";
+       program "grep"
+       {
+               source "grep.cpp";
+               build_info
+               {
 -                      library "mspstrings";
++                      library "mspcore";
+               };
+       };
+ 
+       program "transcode"
+       {
+               source "transcode.cpp";
+               build_info
+               {
++                      library "mspcore";
+               };
+       };
+ 
        tarball "@src"
        {
                source "License.txt";

diff --cc Changelog.txt
index 1e5fe5e5e96eace530307e16835876fe0934e0a0,9af98cd6ced9e25f205e2c716b89293c0d93a025..a9d3619be45d92025cc30dc98f8ffef0c1a3015e
--- 1/Changelog.txt
--- 2/Changelog.txt
+++ b/Changelog.txt
@@@ -1,13 -1,14 +1,32 @@@
++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$)