| commit | 917195a691aa1b5077da7b042c5dcce45e5d6c27 | |
| author | Thomas Harning Jr <harningt@gmail.com> | |
| Fri, 19 Sep 2014 20:38:37 +0000 (19 16:38 -0400) | ||
| committer | Thomas Harning Jr <harningt@gmail.com> | |
| Fri, 19 Sep 2014 20:38:37 +0000 (19 16:38 -0400) | ||
| tree | 3f362c9da8f6d0f0bd5c6acc9be4aafae34c86f8 | treesnapshot (tar.gz zip) |
| parent | b7055a7558411490b69f7bef189a92d3ae651f91 | commitdiff |
| parent | d4daa3a798549b36df419815cd702a8689724d26 | commitdiff |
Merge branch '1.1.x' into 1.2.x
* 1.1.x:
base: applies required branch list to travis
base: travis fixes - drop unsupported Lua5.2 lpeg versions and add missing make build
base: fixes regression test lua path
* 1.1.x:
base: applies required branch list to travis
base: travis fixes - drop unsupported Lua5.2 lpeg versions and add missing make build
base: fixes regression test lua path