summaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorMike Pall <mike>2015-01-06 00:12:45 +0100
committerMike Pall <mike>2015-01-06 00:12:45 +0100
commit0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535 (patch)
tree79adfce53c856e0b066683352fd95cb40c97b3c5 /src/Makefile
parentc71cdf4c36145dd052734779d297fdbd7455468f (diff)
parent86913b9bbf75c78a5dcfa2bf6071db8db7df7c51 (diff)
downloadluajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.tar.gz
luajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.tar.bz2
luajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.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 90cb28ce..49afd3a6 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-2014 Mike Pall. See Copyright Notice in luajit.h 10# Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
11############################################################################## 11##############################################################################
12 12
13MAJVER= 2 13MAJVER= 2