summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorLloyd Hilaiel <lloyd@hilaiel.com>2011-04-25 12:50:08 -0600
committerLloyd Hilaiel <lloyd@hilaiel.com>2011-04-25 12:50:08 -0600
commit1888f552a708453055eb88e24c4d34488802995a (patch)
tree3f13fe490b7dc3e39d87fb4718966dab39b49638 /README
parent6327687ed90df58b6238d85fa1f81416571347a4 (diff)
parent6a8906d409dfe6dd3f1e01ed066aa162b1729cec (diff)
downloadyajl-1888f552a708453055eb88e24c4d34488802995a.tar.gz
Merge from 1.x branch (ChangeLog for 1.0.12 and notice about yajl 1 vs yajl 2).
Conflicts: ChangeLog
Diffstat (limited to 'README')
-rw-r--r--README5
1 files changed, 5 insertions, 0 deletions
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?