Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master binary grimoire by Bor Kraljič (115859cb3c1c66865059bfd51eb176a3755944e4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master binary grimoire by Bor Kraljič (115859cb3c1c66865059bfd51eb176a3755944e4)
  • Date: Mon, 15 Aug 2011 09:45:01 -0500

GIT changes to master binary grimoire by Bor Kraljič <pyrobor AT ver.si>:

bin-editors/openoffice-bin/CONFLICTS | 1 +
bin-editors/openoffice-bin/HISTORY | 3 +++
bin-editors/openoffice2-bin/CONFLICTS | 1 +
bin-editors/openoffice2-bin/HISTORY | 3 +++
bin-editors/openoffice3-bin/CONFLICTS | 1 +
bin-editors/openoffice3-bin/HISTORY | 3 +++
6 files changed, 12 insertions(+)

New commits:
commit 115859cb3c1c66865059bfd51eb176a3755944e4
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

openoffice3-bin: it conflicts with libreoffice-bin

commit 43b56f827bb4e2791200233a00ec829ac162aab8
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

openoffice2-bin: it conflicts with libreoffice-bin

commit d6a65901de25894d22b239260a3c0ad87aa3c911
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

openoffice-bin: it conflicts with libreoffice-bin

diff --git a/bin-editors/openoffice-bin/CONFLICTS
b/bin-editors/openoffice-bin/CONFLICTS
index a16fbdb..e88077c 100755
--- a/bin-editors/openoffice-bin/CONFLICTS
+++ b/bin-editors/openoffice-bin/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts libreoffice-bin &&
conflicts openoffice &&
conflicts openoffice2-bin &&
conflicts openoffice3-bin
diff --git a/bin-editors/openoffice-bin/HISTORY
b/bin-editors/openoffice-bin/HISTORY
index 4982792..6c1f417 100644
--- a/bin-editors/openoffice-bin/HISTORY
+++ b/bin-editors/openoffice-bin/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with libreoffice-bin
+
2008-10-22 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: removed REJECT

diff --git a/bin-editors/openoffice2-bin/CONFLICTS
b/bin-editors/openoffice2-bin/CONFLICTS
index 971e78c..90918f7 100755
--- a/bin-editors/openoffice2-bin/CONFLICTS
+++ b/bin-editors/openoffice2-bin/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts libreoffice-bin &&
conflicts openoffice &&
conflicts openoffice-bin &&
conflicts openoffice3-bin
diff --git a/bin-editors/openoffice2-bin/HISTORY
b/bin-editors/openoffice2-bin/HISTORY
index 21d9c8a..e22c066 100644
--- a/bin-editors/openoffice2-bin/HISTORY
+++ b/bin-editors/openoffice2-bin/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with libreoffice-bin
+
2008-10-22 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: removed REJECT

diff --git a/bin-editors/openoffice3-bin/CONFLICTS
b/bin-editors/openoffice3-bin/CONFLICTS
index 8c3c517..e5b8a57 100755
--- a/bin-editors/openoffice3-bin/CONFLICTS
+++ b/bin-editors/openoffice3-bin/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts libreoffice-bin &&
conflicts openoffice &&
conflicts openoffice-bin &&
conflicts openoffice2-bin
diff --git a/bin-editors/openoffice3-bin/HISTORY
b/bin-editors/openoffice3-bin/HISTORY
index 9b38953..6129caf 100644
--- a/bin-editors/openoffice3-bin/HISTORY
+++ b/bin-editors/openoffice3-bin/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with libreoffice-bin
+
2010-08-14 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 3.2.1. Build 9502
Updated SOURCE



  • [SM-Commit] GIT changes to master binary grimoire by Bor Kraljič (115859cb3c1c66865059bfd51eb176a3755944e4), Bor Kraljič, 08/15/2011

Archive powered by MHonArc 2.6.24.

Top of Page