Merge branch 'master' into v2.1

2016-03-03 12:11:37 +01:00
parent 6f3eed9fd8 db1b399af1
commit f4231949b5
192 changed files with 211 additions and 211 deletions
--- a/src/lj_strfmt_num.c
+++ b/src/lj_strfmt_num.c
@@ -1,6 +1,6 @@
 /*
 ** String formatting for floating-point numbers.
-** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
+** Copyright (C) 2005-2016 Mike Pall. See Copyright Notice in luajit.h
 ** Contributed by Peter Cawley.
 */