aboutsummaryrefslogtreecommitdiff
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorMike Pall <mike>2021-01-02 21:56:07 +0100
committerMike Pall <mike>2021-01-02 21:56:07 +0100
commit1e66d0f9e6698fdee672c40a9a5b4159c9254091 (patch)
tree06a019f1a74515bdcd11232f974390c590f5dfa7 /COPYRIGHT
parent3134359734062604f0554b77fde6812a02c1e2b4 (diff)
parentf47c864b0186fc92a2264e68e1151d0d2b24969e (diff)
downloadluajit-1e66d0f9e6698fdee672c40a9a5b4159c9254091.tar.gz
luajit-1e66d0f9e6698fdee672c40a9a5b4159c9254091.tar.bz2
luajit-1e66d0f9e6698fdee672c40a9a5b4159c9254091.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT2
1 files changed, 1 insertions, 1 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index e2f2cef8..9c2bca55 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
1=============================================================================== 1===============================================================================
2LuaJIT -- a Just-In-Time Compiler for Lua. https://luajit.org/ 2LuaJIT -- a Just-In-Time Compiler for Lua. https://luajit.org/
3 3
4Copyright (C) 2005-2020 Mike Pall. All rights reserved. 4Copyright (C) 2005-2021 Mike Pall. All rights reserved.
5 5
6Permission is hereby granted, free of charge, to any person obtaining a copy 6Permission is hereby granted, free of charge, to any person obtaining a copy
7of this software and associated documentation files (the "Software"), to deal 7of this software and associated documentation files (the "Software"), to deal