summaryrefslogtreecommitdiff
path: root/src/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 /src/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 'src/Makefile')
-rw-r--r--src/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile
index cdca7211..6eed3b91 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-2012 Mike Pall. See Copyright Notice in luajit.h 10# Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
11############################################################################## 11##############################################################################
12 12
13MAJVER= 2 13MAJVER= 2