From e7c8d6d1baccc1be7f6966e98d0b1a3f16e683c9 Mon Sep 17 00:00:00 2001 From: Luke Gorrie Date: Tue, 16 Jun 2015 11:37:19 +0200 Subject: [PATCH] Revert "Revert "Merge PR #507 (pflua upgrade) into next"" Reintroduce the pflua upgrade that had been reverted. The problem was a bug introduced in LuaJIT that has since been resolved. This reverts commit 9f5f1ad5cd9d45c9676ea7405f8c2eeaecb0ba36. --- deps/pflua | 2 +- src/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/pflua b/deps/pflua index 13b194e7a2..27523953c0 160000 --- a/deps/pflua +++ b/deps/pflua @@ -1 +1 @@ -Subproject commit 13b194e7a214faae5c3d2916a998418fc841dbc2 +Subproject commit 27523953c03745d4c4fbbcf81f676bc774e4329e diff --git a/src/Makefile b/src/Makefile index 4ae605606a..ebcf2ccb6d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -8,7 +8,7 @@ E= @echo # Defined here to detect version mismatches at build time. LUAJIT_VSN := "v2.0.4-306-gfe56522" LJSYSCALL_VSN := "v0.10-65-g7081d97" -PFLUA_VSN := "13b194e7a214faae5c3d2916a998418fc841dbc2" +PFLUA_VSN := "27523953c03745d4c4fbbcf81f676bc774e4329e" TEST_SKIPPED="43"