aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMike Pall <mike>2020-01-20 23:34:21 +0100
committerMike Pall <mike>2020-01-20 23:34:21 +0100
commit87b111f0fe18788d38dbafd9d768d720f77f052b (patch)
tree0b31f7728ccfee8426506cc04528471e362fef75 /Makefile
parent981ec8d2aac5cac76bdedd4015b6d32447b29597 (diff)
parent38a5ed4b434618662372c0c1665ed08782f5faa5 (diff)
downloadluajit-87b111f0fe18788d38dbafd9d768d720f77f052b.tar.gz
luajit-87b111f0fe18788d38dbafd9d768d720f77f052b.tar.bz2
luajit-87b111f0fe18788d38dbafd9d768d720f77f052b.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 0f933089..08778136 100644
--- a/Makefile
+++ b/Makefile
@@ -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-2017 Mike Pall. See Copyright Notice in luajit.h 13# Copyright (C) 2005-2020 Mike Pall. See Copyright Notice in luajit.h
14############################################################################## 14##############################################################################
15 15
16MAJVER= 2 16MAJVER= 2