Merge branch 'master' into v2.1

2015-01-06 00:12:45 +01:00
parent c71cdf4c36 86913b9bbf
commit 0a5045c34e
189 changed files with 208 additions and 208 deletions
--- a/src/lj_strfmt.h
+++ b/src/lj_strfmt.h
@@ -1,6 +1,6 @@
 /*
 ** String formatting.
-** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
 */

 #ifndef _LJ_STRFMT_H