From 8a86e52fb5fc49367e79f8f49fb451ab74e089bb Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Thu, 13 Feb 2025 17:51:38 -0800 Subject: [PATCH] merge revision(s) 668701cb0b42f27c5f54309a358c6fcbb24b5d85: [Backport #21002] Added copyright for vendored turbo_tests. [Bug #21002] --- LEGAL | 27 +++++++++++++++++++++++++++ version.h | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/LEGAL b/LEGAL index 55c7ffc291..ee01de962b 100644 --- a/LEGAL +++ b/LEGAL @@ -371,6 +371,33 @@ mentioned below. TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +[spec/lib/turbo_tests/*] +[spec/lib/turbo_tests.rb] +[spec/lib/utils/*] + + These files are under the MIT License. + + >>> + Copyright (c) 2020 Ilya Zub + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + [parse.c] [parse.h] diff --git a/version.h b/version.h index 334b1ab7e7..1c6d0811ad 100644 --- a/version.h +++ b/version.h @@ -11,7 +11,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 3 +#define RUBY_PATCHLEVEL 4 #include "ruby/version.h" #include "ruby/internal/abi.h"