?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 30af297 d60cebe)
Merge branch '1.0.x' into 1.1.x
commit35ee3e2413ef1a79fcac57c1f669ed435e04d72b
authorThomas Harning Jr <harningt@gmail.com>
Fri, 19 Sep 2014 19:38:33 +0000 (19 15:38 -0400)
committerThomas Harning Jr <harningt@gmail.com>
Fri, 19 Sep 2014 19:38:33 +0000 (19 15:38 -0400)
treea4d4d4ac23e7bcce0ab0f4bd550b6e5f672cd1a0tree | snapshot (tar.gz zip)
parent30af297abb239e116a62467f39a44ce21b57d823commit | diff
parentd60cebed498876aa01a7352ae6fe56354a11cdf0commit | diff
Merge branch '1.0.x' into 1.1.x

* 1.0.x:
  base: fixes 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