summaryrefslogtreecommitdiff
path: root/tex/generic
diff options
context:
space:
mode:
authorContext Git Mirror Bot <phg42.2a@gmail.com>2016-08-29 23:52:21 +0200
committerContext Git Mirror Bot <phg42.2a@gmail.com>2016-08-29 23:52:21 +0200
commitad968343b10553bbf9d34e14e00a756576d5758e (patch)
tree3fb7779efb282ff06eea3e093e5c343cb5c92527 /tex/generic
parent0a0ad928b3eb911e1963b282dfebc9e891fefaa5 (diff)
downloadcontext-ad968343b10553bbf9d34e14e00a756576d5758e.tar.gz
2016-08-29 22:58:00
Diffstat (limited to 'tex/generic')
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
-rw-r--r--tex/generic/context/luatex/luatex-swiglib-test.lua3
2 files changed, 3 insertions, 2 deletions
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index c680531d6..06990de3c 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua
-- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date : 08/29/16 11:16:30
+-- merge date : 08/29/16 22:53:15
do -- begin closure to overcome local limits and interference
diff --git a/tex/generic/context/luatex/luatex-swiglib-test.lua b/tex/generic/context/luatex/luatex-swiglib-test.lua
index db6a72909..0bca2a818 100644
--- a/tex/generic/context/luatex/luatex-swiglib-test.lua
+++ b/tex/generic/context/luatex/luatex-swiglib-test.lua
@@ -1,4 +1,5 @@
-local gm = swiglib("gmwand.core")
+local gm = require("swiglib.gmwand.core")
+-- local gm = swiglib("gmwand.core")
gm.InitializeMagick(".")