Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall
2016-03-03 12:11:37 +01:00
192 changed files with 211 additions and 211 deletions

View File

@@ -10,7 +10,7 @@
# For MSVC, please follow the instructions given in src/msvcbuild.bat.
# For MinGW and Cygwin, cd to src and run make with the Makefile there.
#
# Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
# Copyright (C) 2005-2016 Mike Pall. See Copyright Notice in luajit.h
##############################################################################
MAJVER= 2