Merge from 1.x branch (ChangeLog for 1.0.12 and notice about yajl 1 vs yajl 2).

Conflicts:
	ChangeLog

2 files changed, 15 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 4a685ed..5e84d3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,16 @@
      * lth addition of a little in tree performance benchmark, `perftest` in
 	perf/perftest.c
 
+1.0.12
+     * Conrad Irwin - Parse null bytes correctly
+     * Mirek Rusin - fix LLVM warnings
+     * gno - Don't generate numbers for keys. closes #13
+     * lth - various win32 fixes, including build documentation improvements
+     * John Stamp - Don't export private symbols.
+     * John Stamp - Install yajl_version.h, not the template.
+     * John Stamp - Don't use -fPIC for static lib.  Cmake will automatically add it for the shared.
+     * lth 0 fix paths embedded in dylib upon installation on osx.  closes #11
+
 1.0.11
      * lth remove -Wno-missing-field-initializers for greater gcc compat (3.4.6)
 
diff --git a/README b/README
index 3f434b9..5e53062 100644
--- a/README
+++ b/README
@@ -1,3 +1,8 @@
+**********************************************************************
+        This is YAJL 2, for the legacy version of YAJL.  see
+              https://github.com/lloyd/yajl/tree/1.x
+**********************************************************************
+
 Welcome to Yet Another JSON Library (YAJL)
 
 ## Why does the world need another C library for parsing JSON?