sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Jaka Kranjc (97cf942e51951ee204a778506d10805fe281714a)

From: Jaka Kranjc <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (97cf942e51951ee204a778506d10805fe281714a)
Date: Sat, 19 Dec 2009 03:50:42 -0600

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

audio-libs/openal/CONFLICTS | 1 +
audio-libs/openal/HISTORY | 3 +++
2 files changed, 4 insertions(+)

New commits:
commit 97cf942e51951ee204a778506d10805fe281714a
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

openal: conflict with openal-soft in both directions

diff --git a/audio-libs/openal/CONFLICTS b/audio-libs/openal/CONFLICTS
new file mode 100755
index 0000000..17905bd
--- /dev/null
+++ b/audio-libs/openal/CONFLICTS
@@ -0,0 +1 @@
+conflicts openal-soft
diff --git a/audio-libs/openal/HISTORY b/audio-libs/openal/HISTORY
index e9f50d8..6e679ce 100644
--- a/audio-libs/openal/HISTORY
+++ b/audio-libs/openal/HISTORY
@@ -1,3 +1,6 @@
+2009-12-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * CONFLICTS: added for openal-soft
+
2009-04-30 Ethan Grammatikidis <eekee57 AT fastmail.fm>
* UP_TRIGGERS: new
* UP_TRIGGERS: not as simple as I thought

[SM-Commit] GIT changes to master grimoire by Jaka Kranjc (97cf942e51951ee204a778506d10805fe281714a), Jaka Kranjc, 12/19/2009