Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (b024f8c3d9a24c570bbb22ef4741518d9d0fd666)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (b024f8c3d9a24c570bbb22ef4741518d9d0fd666)
  • Date: Mon, 20 Aug 2007 16:51:10 -0500

GIT changes to master z-rejected grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

z-java/jdk6-bin/CONFLICTS | 3 ++-
z-java/jdk6-bin/HISTORY | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit b024f8c3d9a24c570bbb22ef4741518d9d0fd666
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

jdk6-bin: Also conflicts with jdk1.5-bin

diff --git a/z-java/jdk6-bin/CONFLICTS b/z-java/jdk6-bin/CONFLICTS
index 20e3319..ef4affb 100755
--- a/z-java/jdk6-bin/CONFLICTS
+++ b/z-java/jdk6-bin/CONFLICTS
@@ -1,3 +1,4 @@
conflicts j2sdk &&
conflicts j2sdk-bin &&
-conflicts jre1.5-bin
+conflicts jre1.5-bin &&
+conflicts jdk1.5-bin
diff --git a/z-java/jdk6-bin/HISTORY b/z-java/jdk6-bin/HISTORY
index d73aede..7d8b08e 100644
--- a/z-java/jdk6-bin/HISTORY
+++ b/z-java/jdk6-bin/HISTORY
@@ -1,4 +1,7 @@
2007-08-19 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Also conflicts with jdk1.5-bin
+
+2007-08-19 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Increment PATCHLEVEL to install plugin (for ia32
architectures)
* INSTALL: SMGL_COMPAT_ARCH[0] -> SMGL_COMPAT_ARCHS[1]




  • [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (b024f8c3d9a24c570bbb22ef4741518d9d0fd666), Eric Sandall, 08/20/2007

Archive powered by MHonArc 2.6.24.

Top of Page