Merge branch 'master' into v2.1

2014-01-16 23:18:34 +01:00
parent ce9e8ed675 ef59e54820
commit a9d4543601
185 changed files with 204 additions and 204 deletions
--- a/src/lj_trace.c
+++ b/src/lj_trace.c
@@ -1,6 +1,6 @@
 /*
 ** Trace management.
-** Copyright (C) 2005-2013 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
 */

 #define lj_trace_c