**********************************************************

** Big Maps Projects code (incl. Multiplayer v1.5 **
**********************************************************
- Merged Big Maps Project code from BMP+MP trunk (Revision: 3340)
o Complete SVN Revision history: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- Before THIS merge, I made a branch of the existing 1.13 source
o SVN Branch: https://81.169.133.124/source/ja2/branches/JA2_rev.3336/src
- Removed old VS 6.0 and VS 2003 project and solutions files, because compilation is broken long time ago
- I will add VS 2010 projects and solution file in the next few days

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3341 3b4a5df2-a311-0410-b5c6-a8a6f20db521

ext/utf8/doc/ReleaseNotes

@@ -1,9 +1,22 @@
 utf8 cpp library
-Release 2.1
+<<<<<<< .mine
+Release 2.3
+=======
+Release 2.2.1
+>>>>>>> .r98
 
-This is a minor feature release - added the function peek_next. 
+<<<<<<< .mine
+This is a bug fix release. 
+=======
+This is a minor bug fix release aimed at supporting GCC 4.3. 
+>>>>>>> .r98
 
-Changes from version 2.o
-- Implemented feature request [ 1770746 ] "Provide a const version of next() (some sort of a peek() )
+<<<<<<< .mine
+Changes from version 2.2
+- Bug fix: ID: 2830326 :  multiple definition of `utf8::internal::is_overlong_sequence
+=======
+Changes from version 2.2
+- Bug fix [ ID: 2823847 ] "warning from GCC 4.3"
+>>>>>>> .r98
 
 Files included in the release: utf8.h, core.h, checked.h, unchecked.h, utf8cpp.html, ReleaseNotes