From c2a8d04b58a65dfc7caa1a3b0e1aed80644d8d70 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Thu, 29 Jul 2021 13:01:07 +0200 Subject: [PATCH] nir: fix utf-8 encoding-issue This UTF-8 encoding issue seems to cause issues with the doxygen docs-integration. Fixes: 21115514857 ("Convert a few files to UTF-8") Reviewed-by: Faith Ekstrand Part-of: (cherry picked from commit a1c220fd935b8731f4bab1891aae0480006630eb) --- .pick_status.json | 2 +- src/compiler/nir/nir_lower_blend.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 18776c6fc0a..7368ca06f49 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -934,7 +934,7 @@ "description": "nir: fix utf-8 encoding-issue", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "21115514857d21154bf2b5af4d8f6acae6e6bdcb", "notes": null diff --git a/src/compiler/nir/nir_lower_blend.h b/src/compiler/nir/nir_lower_blend.h index 91d69828a22..13f9caa21e6 100644 --- a/src/compiler/nir/nir_lower_blend.h +++ b/src/compiler/nir/nir_lower_blend.h @@ -1,5 +1,5 @@ /* - * Copyright  2019 Alyssa Rosenzweig + * Copyright © 2019 Alyssa Rosenzweig * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"),