summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/context
diff options
context:
space:
mode:
authorMojca Miklavec <mojca.miklavec@gmail.com>2012-06-08 12:19:55 +0000
committerMojca Miklavec <mojca.miklavec@gmail.com>2012-06-08 12:19:55 +0000
commit7d4d7bd57d826a9576318a3e8f1db50188764566 (patch)
tree2336337a3561087d91ffefa47a4366d3a4cac3a2 /Master/texmf-dist/tex/generic/context
parent4809fa94a8d42936d46320477ce193190987f4d4 (diff)
ConTeXt 2012.05.30 11:26
git-svn-id: svn://tug.org/texlive/trunk@26861 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 d17e6d463b5..ea509c3386b 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 : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 05/29/12 00:12:55
+-- merge date : 05/30/12 11:26:34
do -- begin closure to overcome local limits and interference