aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMike Pall <mike>2014-01-16 23:18:34 +0100
committerMike Pall <mike>2014-01-16 23:18:34 +0100
commita9d454360161d80310753dafa0d945eea4d98fde (patch)
tree892e5802f261a8c4ac3de4d802b5881aed36eac1 /Makefile
parentce9e8ed675d1fb7fe8e148a328fe0b892791a5f4 (diff)
parentef59e5482055ed4477144518fc79a993288e855b (diff)
downloadluajit-a9d454360161d80310753dafa0d945eea4d98fde.tar.gz
luajit-a9d454360161d80310753dafa0d945eea4d98fde.tar.bz2
luajit-a9d454360161d80310753dafa0d945eea4d98fde.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 4dfa08c9..8ec3635a 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-2013 Mike Pall. See Copyright Notice in luajit.h 13# Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
14############################################################################## 14##############################################################################
15 15
16MAJVER= 2 16MAJVER= 2