summaryrefslogtreecommitdiff
path: root/src/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 /src/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 'src/Makefile')
-rw-r--r--src/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile
index e65b55ee..2e1a2888 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -7,7 +7,7 @@
7# Also works with MinGW and Cygwin on Windows. 7# Also works with MinGW and Cygwin on Windows.
8# Please check msvcbuild.bat for building with MSVC on Windows. 8# Please check msvcbuild.bat for building with MSVC on Windows.
9# 9#
10# Copyright (C) 2005-2020 Mike Pall. See Copyright Notice in luajit.h 10# Copyright (C) 2005-2021 Mike Pall. See Copyright Notice in luajit.h
11############################################################################## 11##############################################################################
12 12
13MAJVER= 2 13MAJVER= 2