sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Bor Kraljič (b3f0f070900b0437c8a7664345ba33923cc8fba2)
- From: Bor Kraljič <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Bor Kraljič (b3f0f070900b0437c8a7664345ba33923cc8fba2)
- Date: Mon, 15 Aug 2011 09:44:07 -0500
GIT changes to master grimoire by Bor Kraljič <pyrobor AT ver.si>:
editors/openoffice/CONFLICTS | 1 +
editors/openoffice/HISTORY | 3 +++
2 files changed, 4 insertions(+)
New commits:
commit b3f0f070900b0437c8a7664345ba33923cc8fba2
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
openoffice: it conflicts with libreoffice-bin
diff --git a/editors/openoffice/CONFLICTS b/editors/openoffice/CONFLICTS
index e57273a..a088dca 100755
--- a/editors/openoffice/CONFLICTS
+++ b/editors/openoffice/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts libreoffice-bin &&
conflicts openoffice-bin &&
conflicts openoffice2-bin &&
conflicts openoffice3-bin
diff --git a/editors/openoffice/HISTORY b/editors/openoffice/HISTORY
index 423e4f8..0fadeb4 100644
--- a/editors/openoffice/HISTORY
+++ b/editors/openoffice/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with libreoffice-bin
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on gcj to dependency on gcc with
sub-depends on JAVA (scripted)
- [SM-Commit] GIT changes to master grimoire by Bor Kraljič (b3f0f070900b0437c8a7664345ba33923cc8fba2), Bor Kraljič, 08/15/2011
Archive powered by MHonArc 2.6.24.