sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b85463cf37af3db43b435c277bddc076987afa32)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b85463cf37af3db43b435c277bddc076987afa32)
- Date: Fri, 30 Sep 2016 02:32:30 +0000
GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:
doc/zathura-pdf-poppler/CONFLICTS | 1 +
doc/zathura-pdf-poppler/HISTORY | 3 +++
2 files changed, 4 insertions(+)
New commits:
commit b85463cf37af3db43b435c277bddc076987afa32
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
zathura-pdf-poppler: conflicts zathura-pdf-mupdf
diff --git a/doc/zathura-pdf-poppler/CONFLICTS
b/doc/zathura-pdf-poppler/CONFLICTS
new file mode 100755
index 0000000..ea6e94a
--- /dev/null
+++ b/doc/zathura-pdf-poppler/CONFLICTS
@@ -0,0 +1 @@
+conflicts zathura-pdf-mupdf
diff --git a/doc/zathura-pdf-poppler/HISTORY b/doc/zathura-pdf-poppler/HISTORY
index 3de8ddc..81f4b5e 100644
--- a/doc/zathura-pdf-poppler/HISTORY
+++ b/doc/zathura-pdf-poppler/HISTORY
@@ -1,3 +1,6 @@
+2016-09-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFLICTS: added, conflicts zathura-pdf-mupdf
+
2016-09-07 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: added, to fix build with gcc 4.6
- [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b85463cf37af3db43b435c277bddc076987afa32), Vlad Glagolev, 09/29/2016
Archive powered by MHonArc 2.6.24.