aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorMike Pall <mike>2016-03-03 12:11:37 +0100
committerMike Pall <mike>2016-03-03 12:11:37 +0100
commitf4231949b5e14e1116452f9e9eea31e19a462c82 (patch)
tree8201252fca8a867ea4d1c33736f1a4dbfd77de6b /src/Makefile
parent6f3eed9fd8d4f666f21d1e15cdf377a71a3925cf (diff)
parentdb1b399af134e715b8ba9a0e4ad9cbafbe06ecb1 (diff)
downloadluajit-f4231949b5e14e1116452f9e9eea31e19a462c82.tar.gz
luajit-f4231949b5e14e1116452f9e9eea31e19a462c82.tar.bz2
luajit-f4231949b5e14e1116452f9e9eea31e19a462c82.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 5d66f6eb..3f25192b 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-2015 Mike Pall. See Copyright Notice in luajit.h 10# Copyright (C) 2005-2016 Mike Pall. See Copyright Notice in luajit.h
11############################################################################## 11##############################################################################
12 12
13MAJVER= 2 13MAJVER= 2