sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (7ea518a7f0cc3c5fb11b8c1555073b5653361d9a)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (7ea518a7f0cc3c5fb11b8c1555073b5653361d9a)
- Date: Mon, 2 Nov 2020 15:36:24 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
qt5/qt3d/CONFLICTS | 1 -
qt5/qt3d/HISTORY | 3 +++
qt5/qtbase/CONFLICTS | 1 -
qt5/qtbase/HISTORY | 3 +++
qt5/qtdeclarative/CONFLICTS | 1 -
qt5/qtdeclarative/HISTORY | 3 +++
qt5/qtgraphicaleffects/CONFLICTS | 1 -
qt5/qtgraphicaleffects/HISTORY | 3 +++
qt5/qtimageformats/CONFLICTS | 1 -
qt5/qtimageformats/HISTORY | 3 +++
qt5/qtlocation/CONFLICTS | 1 -
qt5/qtlocation/HISTORY | 3 +++
qt5/qtmultimedia/CONFLICTS | 1 -
qt5/qtmultimedia/HISTORY | 3 +++
qt5/qtquickcontrols/CONFLICTS | 1 -
qt5/qtquickcontrols/HISTORY | 3 +++
qt5/qtquickcontrols2/CONFLICTS | 1 -
qt5/qtquickcontrols2/HISTORY | 3 +++
qt5/qtscript/CONFLICTS | 1 -
qt5/qtscript/HISTORY | 3 +++
qt5/qtsensors/CONFLICTS | 1 -
qt5/qtsensors/HISTORY | 3 +++
qt5/qtserialport/CONFLICTS | 1 -
qt5/qtserialport/HISTORY | 3 +++
qt5/qtspeech/CONFLICTS | 1 -
qt5/qtspeech/HISTORY | 3 +++
qt5/qtsvg/CONFLICTS | 1 -
qt5/qtsvg/HISTORY | 3 +++
qt5/qttools/CONFLICTS | 1 -
qt5/qttools/HISTORY | 3 +++
qt5/qtvirtualkeyboard/CONFLICTS | 1 -
qt5/qtvirtualkeyboard/HISTORY | 3 +++
qt5/qtwayland/CONFLICTS | 1 -
qt5/qtwayland/HISTORY | 3 +++
qt5/qtwebchannel/CONFLICTS | 1 -
qt5/qtwebchannel/HISTORY | 3 +++
qt5/qtwebengine/CONFLICTS | 2 --
qt5/qtwebengine/HISTORY | 3 +++
qt5/qtwebglplugin/CONFLICTS | 1 -
qt5/qtwebglplugin/HISTORY | 3 +++
qt5/qtwebsockets/CONFLICTS | 1 -
qt5/qtwebsockets/HISTORY | 3 +++
qt5/qtwebview/CONFLICTS | 1 -
qt5/qtwebview/HISTORY | 3 +++
qt5/qtx11extras/CONFLICTS | 1 -
qt5/qtx11extras/HISTORY | 3 +++
qt5/qtxmlpatterns/CONFLICTS | 1 -
qt5/qtxmlpatterns/HISTORY | 3 +++
48 files changed, 72 insertions(+), 25 deletions(-)
New commits:
commit 7ea518a7f0cc3c5fb11b8c1555073b5653361d9a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtxmlpatterns - delete CONFLICTS
commit 0ead67b64e465d88572558062a01877a9b91a6d7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtx11extras - delete CONFLICTS
commit a34abe5e512293eb5902aaaff828de3aa6372018
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtwebview - delete CONFLICTS
commit 290eb5091f4e8e6233ee337e664f6e1eabdeaa1a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtwebsockets - delete CONFLICTS
commit d48df12c93f04c73eb81b8ed4cb1c023f5b5b68c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtwebglplugin - delete CONFLICTS
commit c0e339c924fb193c8dc172709dac401124e6f226
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtwebengine - delete CONFLICTS
commit 5069714e7dd0c78f04108c56bd580a0ba66d1971
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtwebchannel - delete CONFLICTS
commit c50533de7212c40c0cb11070555179061a9e55a4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtwayland - delete CONFLICTS
commit bdcff6812ed2c749d235c5ddbbba3d52d02c5a02
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtvirtualkeyboard - delete CONFLICTS
commit a382c9a2ecb2871dc90d0743572cda14400f2df0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qttools - delete CONFLICTS
commit cbe9bb75724a4d24e189de2e01f43a44d3d201c0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtsvg - delete CONFLICTS
commit 351eb3ea1b1181a7d0ce63a3d67de701f03eff96
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtspeech - delete CONFLICTS
commit 55ba62ec3300455296e00aa406acda6c0ddd7bfc
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtserialport - delete CONFLICTS
commit 65ec2b79ac8aa09f4cdeab8d9042ec07c8eabc3d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtsensors - delete CONFLICTS
commit 01718a27d0566eb65fdde1e4430515a4baa34160
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtscript - delete CONFLICTS
commit 083487b6e0855ec1a74d50bd6be3bb6428289f21
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtquickcontrols2 - delete CONFLICTS
commit e58c305c154f6835b9f0b452a21353c858c63ce2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtquickcontrols - delete CONFLICTS
commit 12f83dcfcb9e05992336838f8b32d38f0a68f828
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtmultimedia - delete CONFLICTS
commit c13de195f7f3f93a9c87dd71a6a1147ef456be11
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtlocation - delete CONFLICTS
commit 449fbda2e943abfa7b9b7bb3399474d2d421f135
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtimageformats - delete CONFLICTS
commit 75337967a5a0cf1b7b3e3e9c40474384e541210a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtgraphicaleffects - delete CONFLICTS
commit 9c445f4b137300fcc6723d92b26313d1197eea33
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtdeclarative - delete CONFLICTS
commit 5d1d6e70213ac7435a54f4346f6cf95bee57b720
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtbase - delete CONFLICTS
commit a2a13997ee3983a5731390be32ff4724d4f2c152
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qt3d - delete CONFLICTS
diff --git a/qt5/qt3d/CONFLICTS b/qt5/qt3d/CONFLICTS
deleted file mode 100755
index bcef768..0000000
--- a/qt5/qt3d/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qt3d y
diff --git a/qt5/qt3d/HISTORY b/qt5/qt3d/HISTORY
index 33d2697..e938547 100644
--- a/qt5/qt3d/HISTORY
+++ b/qt5/qt3d/HISTORY
@@ -1,3 +1,6 @@
+2020-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONLICTS: deleted
+
2020-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.1
diff --git a/qt5/qtbase/CONFLICTS b/qt5/qtbase/CONFLICTS
deleted file mode 100755
index 5556dab..0000000
--- a/qt5/qtbase/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtbase y
diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index 5dbf714..bb9d5d7 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,6 @@
+2020-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONLICTS: deleted
+
2020-09-29 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD: Qt uses own compiler flags, try to at least honour
-Os by translating to -optimize-size
diff --git a/qt5/qtdeclarative/CONFLICTS b/qt5/qtdeclarative/CONFLICTS
deleted file mode 100755
index eb943aa..0000000
--- a/qt5/qtdeclarative/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtdeclarative y
diff --git a/qt5/qtdeclarative/HISTORY b/qt5/qtdeclarative/HISTORY
index 26ac533..e723730 100644
--- a/qt5/qtdeclarative/HISTORY
+++ b/qt5/qtdeclarative/HISTORY
@@ -1,3 +1,6 @@
+2020-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONLICTS: deleted
+
2020-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.1
diff --git a/qt5/qtgraphicaleffects/CONFLICTS
b/qt5/qtgraphicaleffects/CONFLICTS
deleted file mode 100755
index 9e7d973..0000000
--- a/qt5/qtgraphicaleffects/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtgraphicaleffects y
diff --git a/qt5/qtgraphicaleffects/HISTORY b/qt5/qtgraphicaleffects/HISTORY
index 79e4cfa..0057e16 100644
--- a/qt5/qtgraphicaleffects/HISTORY
+++ b/qt5/qtgraphicaleffects/HISTORY
@@ -1,3 +1,6 @@
+2020-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONLICTS: deleted
+
2020-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.1
diff --git a/qt5/qtimageformats/CONFLICTS b/qt5/qtimageformats/CONFLICTS
deleted file mode 100755
index 423e12e..0000000
--- a/qt5/qtimageformats/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtimageformats y
diff --git a/qt5/qtimageformats/HISTORY b/qt5/qtimageformats/HISTORY
index 3fb9a77..1c066f1 100644
--- a/qt5/qtimageformats/HISTORY
+++ b/qt5/qtimageformats/HISTORY
@@ -1,3 +1,6 @@
+2020-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONLICTS: deleted
+
2020-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.1
diff --git a/qt5/qtlocation/CONFLICTS b/qt5/qtlocation/CONFLICTS
deleted file mode 100755
index 884231b..0000000
--- a/qt5/qtlocation/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtlocation y
diff --git a/qt5/qtlocation/HISTORY b/qt5/qtlocation/HISTORY
index 06e0a14..099fa05 100644
--- a/qt5/qtlocation/HISTORY
+++ b/qt5/qtlocation/HISTORY
@@ -1,3 +1,6 @@
+2020-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONLICTS: deleted
+
2020-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.1
diff --git a/qt5/qtmultimedia/CONFLICTS b/qt5/qtmultimedia/CONFLICTS
deleted file mode 100755
index 7884972..0000000
--- a/qt5/qtmultimedia/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtmultimedia y
diff --git a/qt5/qtmultimedia/HISTORY b/qt5/qtmultimedia/HISTORY
index d6ca1e2..2f39b36 100644
--- a/qt5/qtmultimedia/HISTORY
+++ b/qt5/qtmultimedia/HISTORY
@@ -1,3 +1,6 @@
+2020-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONLICTS: deleted
+
2020-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.1
diff --git a/qt5/qtquickcontrols/CONFLICTS b/qt5/qtquickcontrols/CONFLICTS
deleted file mode 100755
index 23a5337..0000000
--- a/qt5/qtquickcontrols/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtquickcontrols y
diff --git a/qt5/qtquickcontrols/HISTORY b/qt5/qtquickcontrols/HISTORY
index 6018f46..3c62e32 100644
--- a/qt5/qtquickcontrols/HISTORY
+++ b/qt5/qtquickcontrols/HISTORY
@@ -1,3 +1,6 @@
+2020-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONLICTS: deleted
+
2020-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.1
diff --git a/qt5/qtquickcontrols2/CONFLICTS b/qt5/qtquickcontrols2/CONFLICTS
deleted file mode 100755
index d3153cd..0000000
--- a/qt5/qtquickcontrols2/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtquickcontrols2 y
diff --git a/qt5/qtquickcontrols2/HISTORY b/qt5/qtquickcontrols2/HISTORY
index 12327ae..157a3c6 100644
--- a/qt5/qtquickcontrols2/HISTORY
+++ b/qt5/qtquickcontrols2/HISTORY
@@ -1,3 +1,6 @@
+2020-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONLICTS: deleted
+
2020-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.1
diff --git a/qt5/qtscript/CONFLICTS b/qt5/qtscript/CONFLICTS
deleted file mode 100755
index 3563d99..0000000
--- a/qt5/qtscript/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtscript y
diff --git a/qt5/qtscript/HISTORY b/qt5/qtscript/HISTORY
index 2d40cd6..ad2e7a2 100644
--- a/qt5/qtscript/HISTORY
+++ b/qt5/qtscript/HISTORY
@@ -1,3 +1,6 @@
+2020-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONLICTS: deleted
+
2020-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.1
diff --git a/qt5/qtsensors/CONFLICTS b/qt5/qtsensors/CONFLICTS
deleted file mode 100755
index 175a70e..0000000
--- a/qt5/qtsensors/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtsensors y
diff --git a/qt5/qtsensors/HISTORY b/qt5/qtsensors/HISTORY
index 8c27ace..f26d9f0 100644
--- a/qt5/qtsensors/HISTORY
+++ b/qt5/qtsensors/HISTORY
@@ -1,3 +1,6 @@
+2020-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONLICTS: deleted
+
2020-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.1
diff --git a/qt5/qtserialport/CONFLICTS b/qt5/qtserialport/CONFLICTS
deleted file mode 100755
index 4afa6da..0000000
--- a/qt5/qtserialport/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtserialport y
diff --git a/qt5/qtserialport/HISTORY b/qt5/qtserialport/HISTORY
index 0d00022..f35abb6 100644
--- a/qt5/qtserialport/HISTORY
+++ b/qt5/qtserialport/HISTORY
@@ -1,3 +1,6 @@
+2020-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONLICTS: deleted
+
2020-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.1
diff --git a/qt5/qtspeech/CONFLICTS b/qt5/qtspeech/CONFLICTS
deleted file mode 100755
index e5e4070..0000000
--- a/qt5/qtspeech/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtspeech y
diff --git a/qt5/qtspeech/HISTORY b/qt5/qtspeech/HISTORY
index 8ebdfda..ccbf6d9 100644
--- a/qt5/qtspeech/HISTORY
+++ b/qt5/qtspeech/HISTORY
@@ -1,3 +1,6 @@
+2020-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONLICTS: deleted
+
2020-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.1
diff --git a/qt5/qtsvg/CONFLICTS b/qt5/qtsvg/CONFLICTS
deleted file mode 100755
index 35d6705..0000000
--- a/qt5/qtsvg/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtsvg y
diff --git a/qt5/qtsvg/HISTORY b/qt5/qtsvg/HISTORY
index 2d40cd6..ad2e7a2 100644
--- a/qt5/qtsvg/HISTORY
+++ b/qt5/qtsvg/HISTORY
@@ -1,3 +1,6 @@
+2020-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONLICTS: deleted
+
2020-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.1
diff --git a/qt5/qttools/CONFLICTS b/qt5/qttools/CONFLICTS
deleted file mode 100755
index 38af5ea..0000000
--- a/qt5/qttools/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qttools y
diff --git a/qt5/qttools/HISTORY b/qt5/qttools/HISTORY
index ae5398c..1dc6449 100644
--- a/qt5/qttools/HISTORY
+++ b/qt5/qttools/HISTORY
@@ -1,3 +1,6 @@
+2020-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONLICTS: deleted
+
2020-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.1
diff --git a/qt5/qtvirtualkeyboard/CONFLICTS b/qt5/qtvirtualkeyboard/CONFLICTS
deleted file mode 100755
index 7ed88f2..0000000
--- a/qt5/qtvirtualkeyboard/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtvirtualkeyboard y
diff --git a/qt5/qtvirtualkeyboard/HISTORY b/qt5/qtvirtualkeyboard/HISTORY
index df7365d..e1947cf 100644
--- a/qt5/qtvirtualkeyboard/HISTORY
+++ b/qt5/qtvirtualkeyboard/HISTORY
@@ -1,3 +1,6 @@
+2020-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONLICTS: deleted
+
2020-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.1
diff --git a/qt5/qtwayland/CONFLICTS b/qt5/qtwayland/CONFLICTS
deleted file mode 100755
index 05c8e86..0000000
--- a/qt5/qtwayland/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtwayland y
diff --git a/qt5/qtwayland/HISTORY b/qt5/qtwayland/HISTORY
index bfe62a1..dcb35ee 100644
--- a/qt5/qtwayland/HISTORY
+++ b/qt5/qtwayland/HISTORY
@@ -1,3 +1,6 @@
+2020-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONLICTS: deleted
+
2020-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.1
diff --git a/qt5/qtwebchannel/CONFLICTS b/qt5/qtwebchannel/CONFLICTS
deleted file mode 100755
index 2e45c7a..0000000
--- a/qt5/qtwebchannel/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtwebchannel y
diff --git a/qt5/qtwebchannel/HISTORY b/qt5/qtwebchannel/HISTORY
index b7aaba7..5cf5e3b 100644
--- a/qt5/qtwebchannel/HISTORY
+++ b/qt5/qtwebchannel/HISTORY
@@ -1,3 +1,6 @@
+2020-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONLICTS: deleted
+
2020-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.1
diff --git a/qt5/qtwebengine/CONFLICTS b/qt5/qtwebengine/CONFLICTS
deleted file mode 100755
index b4e09db..0000000
--- a/qt5/qtwebengine/CONFLICTS
+++ /dev/null
@@ -1,2 +0,0 @@
-conflicts qtwebengine y
-conflicts minizip y
diff --git a/qt5/qtwebengine/HISTORY b/qt5/qtwebengine/HISTORY
index 95c1397..d46b180 100644
--- a/qt5/qtwebengine/HISTORY
+++ b/qt5/qtwebengine/HISTORY
@@ -1,3 +1,6 @@
+2020-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONLICTS: deleted
+
2020-09-30 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD: Instead of trying to remove our flags, try to at least
pick up -Os for the build.
diff --git a/qt5/qtwebglplugin/CONFLICTS b/qt5/qtwebglplugin/CONFLICTS
deleted file mode 100755
index 15bc1e7..0000000
--- a/qt5/qtwebglplugin/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtwebglplugin y
diff --git a/qt5/qtwebglplugin/HISTORY b/qt5/qtwebglplugin/HISTORY
index 83bf958..8958d4e 100644
--- a/qt5/qtwebglplugin/HISTORY
+++ b/qt5/qtwebglplugin/HISTORY
@@ -1,3 +1,6 @@
+2020-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONLICTS: deleted
+
2020-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.1
diff --git a/qt5/qtwebsockets/CONFLICTS b/qt5/qtwebsockets/CONFLICTS
deleted file mode 100755
index 4ac7105..0000000
--- a/qt5/qtwebsockets/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtwebsockets y
diff --git a/qt5/qtwebsockets/HISTORY b/qt5/qtwebsockets/HISTORY
index 2d09e3d..d0a57a5 100644
--- a/qt5/qtwebsockets/HISTORY
+++ b/qt5/qtwebsockets/HISTORY
@@ -1,3 +1,6 @@
+2020-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONLICTS: deleted
+
2020-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.1
diff --git a/qt5/qtwebview/CONFLICTS b/qt5/qtwebview/CONFLICTS
deleted file mode 100755
index a26f5bb..0000000
--- a/qt5/qtwebview/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtwebview y
diff --git a/qt5/qtwebview/HISTORY b/qt5/qtwebview/HISTORY
index 410ebc4..792ffe5 100644
--- a/qt5/qtwebview/HISTORY
+++ b/qt5/qtwebview/HISTORY
@@ -1,3 +1,6 @@
+2020-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONLICTS: deleted
+
2020-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.1
diff --git a/qt5/qtx11extras/CONFLICTS b/qt5/qtx11extras/CONFLICTS
deleted file mode 100755
index ea823f3..0000000
--- a/qt5/qtx11extras/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtx11extras y
diff --git a/qt5/qtx11extras/HISTORY b/qt5/qtx11extras/HISTORY
index 9571004..4be7ed3 100644
--- a/qt5/qtx11extras/HISTORY
+++ b/qt5/qtx11extras/HISTORY
@@ -1,3 +1,6 @@
+2020-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONLICTS: deleted
+
2020-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.1
diff --git a/qt5/qtxmlpatterns/CONFLICTS b/qt5/qtxmlpatterns/CONFLICTS
deleted file mode 100755
index 2b1cd4f..0000000
--- a/qt5/qtxmlpatterns/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtxmlpatterns y
diff --git a/qt5/qtxmlpatterns/HISTORY b/qt5/qtxmlpatterns/HISTORY
index 489c3c7..461fb61 100644
--- a/qt5/qtxmlpatterns/HISTORY
+++ b/qt5/qtxmlpatterns/HISTORY
@@ -1,3 +1,6 @@
+2020-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONLICTS: deleted
+
2020-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.1
- [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (7ea518a7f0cc3c5fb11b8c1555073b5653361d9a), Treeve Jelbert, 11/02/2020
Archive powered by MHonArc 2.6.24.