| commit | d4daa3a798549b36df419815cd702a8689724d26 | |
| author | Thomas Harning Jr <harningt@gmail.com> | |
| Fri, 19 Sep 2014 20:38:04 +0000 (19 16:38 -0400) | ||
| committer | Thomas Harning Jr <harningt@gmail.com> | |
| Fri, 19 Sep 2014 20:38:04 +0000 (19 16:38 -0400) | ||
| tree | f41bc2b4e01a5ccee4582d47da2784c956bade16 | treesnapshot (tar.gz zip) |
| parent | 35ee3e2413ef1a79fcac57c1f669ed435e04d72b | commitdiff |
| parent | cf947fec8cb7365d87f3a707b361dd1b384013d5 | commitdiff |
Merge branch '1.0.x' into 1.1.x
* 1.0.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.0.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