diff options
| author | Mike Pall <mike> | 2015-01-06 00:12:45 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2015-01-06 00:12:45 +0100 |
| commit | 0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535 (patch) | |
| tree | 79adfce53c856e0b066683352fd95cb40c97b3c5 /src/luajit.h | |
| parent | c71cdf4c36145dd052734779d297fdbd7455468f (diff) | |
| parent | 86913b9bbf75c78a5dcfa2bf6071db8db7df7c51 (diff) | |
| download | luajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.tar.gz luajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.tar.bz2 luajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/luajit.h')
| -rw-r--r-- | src/luajit.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/luajit.h b/src/luajit.h index 4e1da9a4..3db4bba7 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-2014 Mike Pall. All rights reserved. | 4 | ** Copyright (C) 2005-2015 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-alpha" | 33 | #define LUAJIT_VERSION "LuaJIT 2.1.0-alpha" |
| 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_alpha | 35 | #define LUAJIT_VERSION_SYM luaJIT_version_2_1_0_alpha |
| 36 | #define LUAJIT_COPYRIGHT "Copyright (C) 2005-2014 Mike Pall" | 36 | #define LUAJIT_COPYRIGHT "Copyright (C) 2005-2015 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. */ |