summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/context/luatex/luatex-fonts-merged.lua
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-16 18:18:10 +0000
committerKarl Berry <karl@freefriends.org>2016-05-16 18:18:10 +0000
commit815e54f6a349937be9afb419f12989c0b9652ab3 (patch)
tree1216f1f111c36e42860b50d3297700956b9cc40f /Master/texmf-dist/tex/generic/context/luatex/luatex-fonts-merged.lua
parent0f17ceebbcc6309a40823416a4a99e9ddf02dc65 (diff)
context update + remove nonfree *.icc color profiles
git-svn-id: svn://tug.org/texlive/trunk@41191 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/context/luatex/luatex-fonts-merged.lua')
-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 ea46d7d357a..69d5cfe140a 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/14/16 14:06:50
+-- merge date : 05/15/16 20:46:20
do -- begin closure to overcome local limits and interference