aboutsummaryrefslogtreecommitdiff
path: root/src/lib_io.c
diff options
context:
space:
mode:
authorMike Pall <mike>2014-01-16 23:18:34 +0100
committerMike Pall <mike>2014-01-16 23:18:34 +0100
commita9d454360161d80310753dafa0d945eea4d98fde (patch)
tree892e5802f261a8c4ac3de4d802b5881aed36eac1 /src/lib_io.c
parentce9e8ed675d1fb7fe8e148a328fe0b892791a5f4 (diff)
parentef59e5482055ed4477144518fc79a993288e855b (diff)
downloadluajit-a9d454360161d80310753dafa0d945eea4d98fde.tar.gz
luajit-a9d454360161d80310753dafa0d945eea4d98fde.tar.bz2
luajit-a9d454360161d80310753dafa0d945eea4d98fde.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lib_io.c')
-rw-r--r--src/lib_io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib_io.c b/src/lib_io.c
index ca87ec4d..09900fcc 100644
--- a/src/lib_io.c
+++ b/src/lib_io.c
@@ -1,6 +1,6 @@
1/* 1/*
2** I/O library. 2** I/O library.
3** Copyright (C) 2005-2013 Mike Pall. See Copyright Notice in luajit.h 3** Copyright (C) 2005-2014 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-2011 Lua.org, PUC-Rio. See Copyright Notice in lua.h 6** Copyright (C) 1994-2011 Lua.org, PUC-Rio. See Copyright Notice in lua.h