summaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorMike Pall <mike>2017-01-17 12:41:05 +0100
committerMike Pall <mike>2017-01-17 12:41:05 +0100
commit71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd (patch)
tree898e706d4b2455c2c3799cc179f3bc7adf096858 /src/Makefile
parentc94b921f924c1b37fea52e34f4e01ba8b37d77d0 (diff)
parentb93a1dd0c831cab22f98163d0dde792a493c0eef (diff)
downloadluajit-71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd.tar.gz
luajit-71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd.tar.bz2
luajit-71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd.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 21e16a22..5a2277cc 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-2016 Mike Pall. See Copyright Notice in luajit.h 10# Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
11############################################################################## 11##############################################################################
12 12
13MAJVER= 2 13MAJVER= 2