diff options
author | Lloyd Hilaiel <lloyd@hilaiel.com> | 2011-04-25 12:50:08 -0600 |
---|---|---|
committer | Lloyd Hilaiel <lloyd@hilaiel.com> | 2011-04-25 12:50:08 -0600 |
commit | 1888f552a708453055eb88e24c4d34488802995a (patch) | |
tree | 3f13fe490b7dc3e39d87fb4718966dab39b49638 | |
parent | 6327687ed90df58b6238d85fa1f81416571347a4 (diff) | |
parent | 6a8906d409dfe6dd3f1e01ed066aa162b1729cec (diff) | |
download | yajl-1888f552a708453055eb88e24c4d34488802995a.tar.gz |
Merge from 1.x branch (ChangeLog for 1.0.12 and notice about yajl 1 vs yajl 2).
Conflicts:
ChangeLog
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | README | 5 |
2 files changed, 15 insertions, 0 deletions
@@ -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) @@ -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? |