Merge branch '2.1.x' of git.lyx.org:lyx into 2.1.x

This commit is contained in:
Uwe Stöhr 2015-02-09 01:15:23 +01:00
commit 2c3f673c32
3 changed files with 4 additions and 1 deletions

View File

@ -29,6 +29,8 @@ if [ "$LASTNUM" = "1" ]; then
NUMFIX="st";
elif [ "$LASTNUM" = "2" ]; then
NUMFIX="nd";
elif [ "$LASTNUM" = "3" ]; then
NUMFIX="rd";
fi
NUM="$LASTNUM$NUMFIX";

View File

@ -1,4 +1,4 @@
This is patch-VERSION, the NUMst maintenance patch against LyX ORIGINAL.
This is patch-VERSION, the NUM maintenance patch against LyX ORIGINAL.
You need the source of lyx LAST to apply this patch.
This patch should be applied like this

View File

@ -2159,6 +2159,7 @@ dist_templates_DATA = \
templates/IJMPC.lyx \
templates/IJMPD.lyx \
templates/IOP-article.lyx \
templates/ja_beamer-conference-ornate-20min.lyx \
templates/JASA.lyx \
templates/JSS-article.lyx \
templates/kluwer.lyx \