aboutsummaryrefslogtreecommitdiff
path: root/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 /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 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 8ce773e3..28be889e 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-2015 Mike Pall. See Copyright Notice in luajit.h 13# Copyright (C) 2005-2016 Mike Pall. See Copyright Notice in luajit.h
14############################################################################## 14##############################################################################
15 15
16MAJVER= 2 16MAJVER= 2