From 4987ecd9e0ad66ab5ac5093aceaf561dea90f9ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
Date: Sun, 23 Oct 2022 13:28:09 +0200
Subject: [PATCH] Update to 2022.2

---
 .gitignore   |  2 +-
 shaderc.spec | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index bd7832e..94e3acf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,5 +9,5 @@
 /shaderc-24275a1.tar.gz
 /shaderc-bdd134d.tar.gz
 /shaderc-adca18d.tar.gz
-/shaderc-315d39d.tar.gz
+/shaderc-1701a27.tar.gz
 /shaderc-551f106.tar.gz
diff --git a/shaderc.spec b/shaderc.spec
index 4bb8161..345297b 100644
--- a/shaderc.spec
+++ b/shaderc.spec
@@ -1,6 +1,7 @@
 # Force out of source build
 %undefine __cmake_in_source_build
 
+<<<<<<< HEAD
 # Release 2022.2
 %global commit          551f106dc64a1cacb298cc2f05613d142b53302f
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
@@ -8,6 +9,15 @@
 
 # Glslang revision from packaged version
 %global glslang_version 600c5037baac82a80851d1fb95f3f09d34bb43e8
+=======
+# Release 2022.3
+%global commit          551f106dc64a1cacb298cc2f05613d142b53302f
+%global shortcommit     %(c=%{commit}; echo ${c:0:7})
+%global snapshotdate    20221023
+
+# Glslang revision from packaged version
+%global glslang_version 73c9630da979017b2f7e19c6549e2bdb93d9b238
+>>>>>>> 8d827ff (Update to 2022.2)
 
 Name:           shaderc
 Version:        2022.2