?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 33e903b 35ee3e2)
Merge branch '1.1.x' into 1.2.x
commitb7055a7558411490b69f7bef189a92d3ae651f91
authorThomas Harning Jr <harningt@gmail.com>
Fri, 19 Sep 2014 19:38:43 +0000 (19 15:38 -0400)
committerThomas Harning Jr <harningt@gmail.com>
Fri, 19 Sep 2014 19:38:43 +0000 (19 15:38 -0400)
tree573b9a9bb8c7d32fa54db209698eec362cc561f4tree | snapshot (tar.gz zip)
parent33e903b0969c2c039e717cfcd29f11e1a0585d6acommit | diff
parent35ee3e2413ef1a79fcac57c1f669ed435e04d72bcommit | diff
Merge branch '1.1.x' into 1.2.x

* 1.1.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