anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-12 16:50:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
development/tools/lyx-build
View File

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

2
development/tools/patch-preamble
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. You need the source of lyx LAST to apply this patch.
This patch should be applied like this This patch should be applied like this

1
lib/Makefile.am
View File

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