summaryrefslogtreecommitdiff
path: root/src/luajit.h
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/luajit.h
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/luajit.h')
-rw-r--r--src/luajit.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/luajit.h b/src/luajit.h
index 96041851..07756e22 100644
--- a/src/luajit.h
+++ b/src/luajit.h
@@ -1,7 +1,7 @@
1/* 1/*
2** LuaJIT -- a Just-In-Time Compiler for Lua. http://luajit.org/ 2** LuaJIT -- a Just-In-Time Compiler for Lua. http://luajit.org/
3** 3**
4** Copyright (C) 2005-2015 Mike Pall. All rights reserved. 4** Copyright (C) 2005-2016 Mike Pall. All rights reserved.
5** 5**
6** Permission is hereby granted, free of charge, to any person obtaining 6** Permission is hereby granted, free of charge, to any person obtaining
7** a copy of this software and associated documentation files (the 7** a copy of this software and associated documentation files (the
@@ -33,7 +33,7 @@
33#define LUAJIT_VERSION "LuaJIT 2.1.0-beta1" 33#define LUAJIT_VERSION "LuaJIT 2.1.0-beta1"
34#define LUAJIT_VERSION_NUM 20100 /* Version 2.1.0 = 02.01.00. */ 34#define LUAJIT_VERSION_NUM 20100 /* Version 2.1.0 = 02.01.00. */
35#define LUAJIT_VERSION_SYM luaJIT_version_2_1_0_beta1 35#define LUAJIT_VERSION_SYM luaJIT_version_2_1_0_beta1
36#define LUAJIT_COPYRIGHT "Copyright (C) 2005-2015 Mike Pall" 36#define LUAJIT_COPYRIGHT "Copyright (C) 2005-2016 Mike Pall"
37#define LUAJIT_URL "http://luajit.org/" 37#define LUAJIT_URL "http://luajit.org/"
38 38
39/* Modes for luaJIT_setmode. */ 39/* Modes for luaJIT_setmode. */