Permalink
Browse files

Merge from 1.x branch (ChangeLog for 1.0.12 and notice about yajl 1 v…

…s yajl 2).

Conflicts:
	ChangeLog
  • Loading branch information...
2 parents 6327687 + 6a8906d commit 1888f552a708453055eb88e24c4d34488802995a @lloyd committed Apr 25, 2011
Showing with 15 additions and 0 deletions.
  1. +10 −0 ChangeLog
  2. +5 −0 README
View
@@ -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)
View
5 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?

0 comments on commit 1888f55

Please sign in to comment.