summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMike Pall <mike>2021-01-02 21:56:07 +0100
committerMike Pall <mike>2021-01-02 21:56:07 +0100
commit1e66d0f9e6698fdee672c40a9a5b4159c9254091 (patch)
tree06a019f1a74515bdcd11232f974390c590f5dfa7 /Makefile
parent3134359734062604f0554b77fde6812a02c1e2b4 (diff)
parentf47c864b0186fc92a2264e68e1151d0d2b24969e (diff)
downloadluajit-1e66d0f9e6698fdee672c40a9a5b4159c9254091.tar.gz
luajit-1e66d0f9e6698fdee672c40a9a5b4159c9254091.tar.bz2
luajit-1e66d0f9e6698fdee672c40a9a5b4159c9254091.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 45d9f968..aa1b84bd 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-2020 Mike Pall. See Copyright Notice in luajit.h 13# Copyright (C) 2005-2021 Mike Pall. See Copyright Notice in luajit.h
14############################################################################## 14##############################################################################
15 15
16MAJVER= 2 16MAJVER= 2