diff options
author | Mike Pall <mike> | 2017-01-17 12:41:05 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2017-01-17 12:41:05 +0100 |
commit | 71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd (patch) | |
tree | 898e706d4b2455c2c3799cc179f3bc7adf096858 /COPYRIGHT | |
parent | c94b921f924c1b37fea52e34f4e01ba8b37d77d0 (diff) | |
parent | b93a1dd0c831cab22f98163d0dde792a493c0eef (diff) | |
download | luajit-71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd.tar.gz luajit-71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd.tar.bz2 luajit-71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd.zip |
Merge branch 'master' into v2.1
Diffstat (limited to 'COPYRIGHT')
-rw-r--r-- | COPYRIGHT | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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-2016 Mike Pall. All rights reserved. | 4 | Copyright (C) 2005-2017 Mike Pall. All rights reserved. |
5 | 5 | ||
6 | Permission is hereby granted, free of charge, to any person obtaining a copy | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy |
7 | of this software and associated documentation files (the "Software"), to deal | 7 | of this software and associated documentation files (the "Software"), to deal |