summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/context
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-17 21:26:14 +0000
committerKarl Berry <karl@freefriends.org>2016-05-17 21:26:14 +0000
commit089e7e2b5f7b92b6dfc6c6bf0c73b582c503eaaf (patch)
tree6151809a662d36591ae995e12cd6a8d7240dca71 /Master/texmf-dist/tex/generic/context
parent0c7ddd509036cc608279b743a5ca46a5003b0251 (diff)
context, from current (17may16)
git-svn-id: svn://tug.org/texlive/trunk@41222 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/context')
-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 69d5cfe140a..83efc517fd8 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/15/16 20:46:20
+-- merge date : 05/17/16 19:20:58
do -- begin closure to overcome local limits and interference