.gitignore

@@ -36,7 +36,6 @@
 /qtbase-everywhere-src-6.9.0.tar.xz
 /qtbase-everywhere-src-6.9.1.tar.xz
 /qtbase-everywhere-src-6.9.2.tar.xz
-/qtbase-everywhere-src-6.9.3.tar.xz
 /qtbase-everywhere-src-6.10.0-rc.tar.xz
 /qtbase-everywhere-src-6.10.0.tar.xz
 /qtbase-everywhere-src-6.10.1.tar.xz

qt6-qtbase.spec

@@ -440,11 +440,7 @@ translationdir=%{_qt6_translationdir}
 
 Name: Qt6
 Description: Qt6 Configuration
-<<<<<<< HEAD
-Version: 6.9.3
-=======
 Version: 6.10.1
->>>>>>> f43
 EOF
 
 # rpm macros
@@ -986,8 +982,14 @@ make check -k ||:
 * Wed Oct 29 2025 Jan Grulich <jgrulich@redhat.com> - 6.10.0-2
 - Backport: Wayland - convey preference for server side decorations
 
-* Mon Oct 20 2025 Jan Grulich <jgrulich@redhat.com> - 6.9.3-1
-- 6.9.3
+* Tue Oct 07 2025 Jan Grulich <jgrulich@redhat.com> - 6.10.0-1
+- 6.10.0
+
+* Tue Sep 30 2025 Gwyn Ciesla <gwync@protonmail.com> - 6.10.0~rc-2
+- Firebird 5 rebuild
+
+* Thu Sep 25 2025 Jan Grulich <jgrulich@redhat.com> - 6.10.0~rc-1
+- 6.10.0 RC
 
 * Thu Aug 28 2025 Jan Grulich <jgrulich@redhat.com> - 6.9.2-1
 - 6.9.2