diff options
author | Mike Pall <mike> | 2020-01-20 23:34:21 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2020-01-20 23:34:21 +0100 |
commit | 87b111f0fe18788d38dbafd9d768d720f77f052b (patch) | |
tree | 0b31f7728ccfee8426506cc04528471e362fef75 /src/lib_os.c | |
parent | 981ec8d2aac5cac76bdedd4015b6d32447b29597 (diff) | |
parent | 38a5ed4b434618662372c0c1665ed08782f5faa5 (diff) | |
download | luajit-87b111f0fe18788d38dbafd9d768d720f77f052b.tar.gz luajit-87b111f0fe18788d38dbafd9d768d720f77f052b.tar.bz2 luajit-87b111f0fe18788d38dbafd9d768d720f77f052b.zip |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lib_os.c')
-rw-r--r-- | src/lib_os.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib_os.c b/src/lib_os.c index ffbc3fdc..47893766 100644 --- a/src/lib_os.c +++ b/src/lib_os.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | ** OS library. | 2 | ** OS library. |
3 | ** Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h | 3 | ** Copyright (C) 2005-2020 Mike Pall. See Copyright Notice in luajit.h |
4 | ** | 4 | ** |
5 | ** Major portions taken verbatim or adapted from the Lua interpreter. | 5 | ** Major portions taken verbatim or adapted from the Lua interpreter. |
6 | ** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h | 6 | ** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h |