summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic
diff options
context:
space:
mode:
authorMojca Miklavec <mojca.miklavec@gmail.com>2012-05-22 21:04:25 +0000
committerMojca Miklavec <mojca.miklavec@gmail.com>2012-05-22 21:04:25 +0000
commita115fb4ebf3890ee3cabdf98f3f945a349860752 (patch)
treee4d25217d24f4c1b6d863007725f538169379e87 /Master/texmf-dist/tex/generic
parentd36378879c10c7378bc52d9fe7d1ce9c3677d98b (diff)
ConTeXt 2012.05.22 16:12
git-svn-id: svn://tug.org/texlive/trunk@26572 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
-rw-r--r--Master/texmf-dist/tex/generic/context/mptopdf/mptopdf.tex2
2 files changed, 2 insertions, 2 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 cdef91b38fd..47863dd99af 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/14/12 16:00:55
+-- merge date : 05/22/12 16:12:31
do -- begin closure to overcome local limits and interference
diff --git a/Master/texmf-dist/tex/generic/context/mptopdf/mptopdf.tex b/Master/texmf-dist/tex/generic/context/mptopdf/mptopdf.tex
index 3efe573924a..d033a2f56f9 100644
--- a/Master/texmf-dist/tex/generic/context/mptopdf/mptopdf.tex
+++ b/Master/texmf-dist/tex/generic/context/mptopdf/mptopdf.tex
@@ -1,6 +1,6 @@
%D \module
%D [ file=mptopdf,
-%D version=2000.03.27,
+%D version=2011.05.19, % 2000.03.27,
%D title=\METAPOST,
%D subtitle=conversion to \PDF,
%D author=Hans Hagen,