aboutsummaryrefslogtreecommitdiff
path: root/src/lj_lex.c
diff options
context:
space:
mode:
authorMike Pall <mike>2016-03-03 12:11:37 +0100
committerMike Pall <mike>2016-03-03 12:11:37 +0100
commitf4231949b5e14e1116452f9e9eea31e19a462c82 (patch)
tree8201252fca8a867ea4d1c33736f1a4dbfd77de6b /src/lj_lex.c
parent6f3eed9fd8d4f666f21d1e15cdf377a71a3925cf (diff)
parentdb1b399af134e715b8ba9a0e4ad9cbafbe06ecb1 (diff)
downloadluajit-f4231949b5e14e1116452f9e9eea31e19a462c82.tar.gz
luajit-f4231949b5e14e1116452f9e9eea31e19a462c82.tar.bz2
luajit-f4231949b5e14e1116452f9e9eea31e19a462c82.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_lex.c')
-rw-r--r--src/lj_lex.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_lex.c b/src/lj_lex.c
index 5a918f74..0187c426 100644
--- a/src/lj_lex.c
+++ b/src/lj_lex.c
@@ -1,6 +1,6 @@
1/* 1/*
2** Lexical analyzer. 2** Lexical analyzer.
3** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h 3** Copyright (C) 2005-2016 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