summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-14 21:37:43 +0000
committerKarl Berry <karl@freefriends.org>2016-05-14 21:37:43 +0000
commitc285b32d78d4d2725778d9de6921cdc6ecbc1b08 (patch)
tree0aef7208e0d845165f9406e7ff230a96d752e79b /Master/texmf-dist/tex/generic
parentde31a6ac7fa4e3394e7b67033d3b15dcc6141a32 (diff)
context (14may16)
git-svn-id: svn://tug.org/texlive/trunk@41118 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r--Master/texmf-dist/tex/generic/context/luatex/luatex-fonts-merged.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/Master/texmf-dist/tex/generic/context/luatex/luatex-fonts-merged.lua b/Master/texmf-dist/tex/generic/context/luatex/luatex-fonts-merged.lua
index 183135443ab..d913e27de41 100644
--- a/Master/texmf-dist/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/Master/texmf-dist/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 : 05/12/16 23:49:15
+-- merge date : 05/13/16 16:21:29
do -- begin closure to overcome local limits and interference