Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall
2015-01-06 00:12:45 +01:00
189 changed files with 208 additions and 208 deletions

View File

@@ -7,7 +7,7 @@
# Also works with MinGW and Cygwin on Windows.
# Please check msvcbuild.bat for building with MSVC on Windows.
#
# Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
# Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
##############################################################################
MAJVER= 2