Merge branch 'master' into v2.1

2017-01-17 12:41:05 +01:00
parent c94b921f92 b93a1dd0c8
commit 71ff7ef8a7
197 changed files with 216 additions and 216 deletions
--- a/src/vm_x86.dasc
+++ b/src/vm_x86.dasc
@@ -1,6 +1,6 @@
 |// Low-level VM code for x86 CPUs.
 |// Bytecode interpreter, fast functions and helper functions.
-|// Copyright (C) 2005-2016 Mike Pall. See Copyright Notice in luajit.h
+|// Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
 |
 |.if P64
 |.arch x64