diff options
| author | Karl Berry <karl@freefriends.org> | 2013-04-27 22:20:47 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2013-04-27 22:20:47 +0000 |
| commit | 38b404935da1517d414a99cb996804cb778fa887 (patch) | |
| tree | 1c3ae2fd631c7b481c4ac4affc2da08cae7c5641 /Master/tlpkg | |
| parent | e05eb05519cff9def907a8814719ceb03b443de3 (diff) | |
noconflict (27apr13)
git-svn-id: svn://tug.org/texlive/trunk@30140 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
| -rwxr-xr-x | Master/tlpkg/bin/tlpkg-ctan-check | 2 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc | 1 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/noconflict.tlpsrc | 0 |
3 files changed, 2 insertions, 1 deletions
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index 26d9d8f65f6..7e5662a9b8e 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -307,7 +307,7 @@ my @TLP_working = qw( newtx newunicodechar newvbtm newverbs nextpage nfssext-cfr niceframe nicefilelist nicetext nih nkarta nlctdoc - noitcrul nolbreaks + noconflict noitcrul nolbreaks nomencl nomentbl nonfloat nonumonpart nopageno nostarch notes notes2bib notoccite nowidow nrc ntgclass ntheorem ntheorem-vn nuc diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc index c0ec18070fa..e16e18d4970 100644 --- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc @@ -542,6 +542,7 @@ depend nicefilelist depend niceframe depend nicetext depend nlctdoc +depend noconflict depend noitcrul depend nolbreaks depend nomencl diff --git a/Master/tlpkg/tlpsrc/noconflict.tlpsrc b/Master/tlpkg/tlpsrc/noconflict.tlpsrc new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/Master/tlpkg/tlpsrc/noconflict.tlpsrc |