summaryrefslogtreecommitdiffstats
path: root/qt6
diff options
context:
space:
mode:
authorTreeve Jelbert2021-09-30 10:36:25 +0200
committerTreeve Jelbert2021-09-30 10:36:25 +0200
commit26f2fc489b84fda06739ec3a76684ffd6f3c7b2c (patch)
tree28018f10637e48433f80a79c1d7edb6f907fd152 /qt6
parentc5964a4039317f5c337664e7a2450c36d83067b2 (diff)
qt6declarative - conflicts qt6quickcontrols2
Diffstat (limited to 'qt6')
-rwxr-xr-xqt6/qt6declarative/CONFLICTS1
-rw-r--r--qt6/qt6declarative/HISTORY1
2 files changed, 2 insertions, 0 deletions
diff --git a/qt6/qt6declarative/CONFLICTS b/qt6/qt6declarative/CONFLICTS
new file mode 100755
index 0000000000..39946e320e
--- /dev/null
+++ b/qt6/qt6declarative/CONFLICTS
@@ -0,0 +1 @@
+conflicts qt6quickcontrols2 y
diff --git a/qt6/qt6declarative/HISTORY b/qt6/qt6declarative/HISTORY
index 857c41c610..0f3ebadc95 100644
--- a/qt6/qt6declarative/HISTORY
+++ b/qt6/qt6declarative/HISTORY
@@ -1,5 +1,6 @@
2021-09-30 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 6.2.0
+ * CONFLICTS: added
2021-07-03 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 6.1.2