diff options
author | Mike Pall <mike> | 2015-01-06 00:12:45 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2015-01-06 00:12:45 +0100 |
commit | 0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535 (patch) | |
tree | 79adfce53c856e0b066683352fd95cb40c97b3c5 /Makefile | |
parent | c71cdf4c36145dd052734779d297fdbd7455468f (diff) | |
parent | 86913b9bbf75c78a5dcfa2bf6071db8db7df7c51 (diff) | |
download | luajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.tar.gz luajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.tar.bz2 luajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.zip |
Merge branch 'master' into v2.1
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -10,7 +10,7 @@ | |||
10 | # For MSVC, please follow the instructions given in src/msvcbuild.bat. | 10 | # For MSVC, please follow the instructions given in src/msvcbuild.bat. |
11 | # For MinGW and Cygwin, cd to src and run make with the Makefile there. | 11 | # For MinGW and Cygwin, cd to src and run make with the Makefile there. |
12 | # | 12 | # |
13 | # Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h | 13 | # Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h |
14 | ############################################################################## | 14 | ############################################################################## |
15 | 15 | ||
16 | MAJVER= 2 | 16 | MAJVER= 2 |