diff options
author | Mike Pall <mike> | 2013-06-03 21:21:45 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2013-06-03 21:21:45 +0200 |
commit | 1fa97bef1fb93a42ba7452eeb23dd37bc2bd1d91 (patch) | |
tree | 855cff8cb1b5c18018a507f448cccb1d26a41cc8 /src/Makefile | |
parent | e92d64a841a068a29364a58357063b71c5b774a2 (diff) | |
parent | 21af151af28d4b3524684b106bd19b02484f67f1 (diff) | |
download | luajit-1fa97bef1fb93a42ba7452eeb23dd37bc2bd1d91.tar.gz luajit-1fa97bef1fb93a42ba7452eeb23dd37bc2bd1d91.tar.bz2 luajit-1fa97bef1fb93a42ba7452eeb23dd37bc2bd1d91.zip |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/Makefile')
-rw-r--r-- | src/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index fa5aed1c..94bc0fd2 100644 --- a/src/Makefile +++ b/src/Makefile | |||
@@ -11,7 +11,7 @@ | |||
11 | ############################################################################## | 11 | ############################################################################## |
12 | 12 | ||
13 | MAJVER= 2 | 13 | MAJVER= 2 |
14 | MINVER= 0 | 14 | MINVER= 1 |
15 | RELVER= 0 | 15 | RELVER= 0 |
16 | ABIVER= 5.1 | 16 | ABIVER= 5.1 |
17 | NODOTABIVER= 51 | 17 | NODOTABIVER= 51 |