?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: cce739d 917195a)
Merge branch '1.2.x'
commit0ef82c23c807a13cfff3c24c31840b216b6962e6
authorThomas Harning Jr <harningt@gmail.com>
Fri, 19 Sep 2014 20:38:49 +0000 (19 16:38 -0400)
committerThomas Harning Jr <harningt@gmail.com>
Fri, 19 Sep 2014 20:38:49 +0000 (19 16:38 -0400)
treeb401a80d249c9901881a22dc83541a1c9f1e2f83tree | snapshot (tar.gz zip)
parentcce739dea114402d6731a94b91372fc7257a3cadcommit | diff
parent917195a691aa1b5077da7b042c5dcce45e5d6c27commit | diff
Merge branch '1.2.x'

* 1.2.x:
  base: applies required branch list to travis
JSON Parser/Constructor for Lua Uses LPeg to decode JSON and tables to encode JSON See canonical GitHub repository: https://www.github.com/harningt/luajson. See http://www.ohloh.net/projects/11513