Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (30a9d8a72298c0450a97904cd350cbf4f52463fb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (30a9d8a72298c0450a97904cd350cbf4f52463fb)
  • Date: Sun, 7 Feb 2016 13:25:35 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

qt5/qtbase/CONFLICTS | 1 +
qt5/qtbase/HISTORY | 3 +++
qt5/qtdeclarative/CONFLICTS | 1 +
qt5/qtdeclarative/HISTORY | 3 +++
4 files changed, 8 insertions(+)

New commits:
commit 30a9d8a72298c0450a97904cd350cbf4f52463fb
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qtdeclarative - add CONFLICTS

commit aaa9b507bc0986ecc8a7f5bc3d659742f7892689
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qtbase - add CONFLICTS

diff --git a/qt5/qtbase/CONFLICTS b/qt5/qtbase/CONFLICTS
new file mode 100755
index 0000000..5556dab
--- /dev/null
+++ b/qt5/qtbase/CONFLICTS
@@ -0,0 +1 @@
+conflicts qtbase y
diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index e2ce8c0..2d221fc 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,6 @@
+2016-02-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS: added
+
2016-01-07 Treeve Jelbert <treeve AT sourcemage.org>
* firebird.patch: updated

diff --git a/qt5/qtdeclarative/CONFLICTS b/qt5/qtdeclarative/CONFLICTS
new file mode 100755
index 0000000..eb943aa
--- /dev/null
+++ b/qt5/qtdeclarative/CONFLICTS
@@ -0,0 +1 @@
+conflicts qtdeclarative y
diff --git a/qt5/qtdeclarative/HISTORY b/qt5/qtdeclarative/HISTORY
index 2d47b3b..0e880ac 100644
--- a/qt5/qtdeclarative/HISTORY
+++ b/qt5/qtdeclarative/HISTORY
@@ -1,3 +1,6 @@
+2016-02-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS: added
+
2015-10-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.5.1




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (30a9d8a72298c0450a97904cd350cbf4f52463fb), Treeve Jelbert, 02/07/2016

Archive powered by MHonArc 2.6.24.

Top of Page