Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (80b615dd54fae55ed36e5cb754da7dd7e2b79718)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (80b615dd54fae55ed36e5cb754da7dd7e2b79718)
  • Date: Sat, 29 Sep 2007 10:28:42 -0500

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

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

New commits:
commit 80b615dd54fae55ed36e5cb754da7dd7e2b79718
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

faad2: conflict with self

diff --git a/audio-libs/faad2/CONFLICTS b/audio-libs/faad2/CONFLICTS
new file mode 100755
index 0000000..349340d
--- /dev/null
+++ b/audio-libs/faad2/CONFLICTS
@@ -0,0 +1 @@
+conflicts faad2 y
diff --git a/audio-libs/faad2/HISTORY b/audio-libs/faad2/HISTORY
index 58a2fbf..14004d0 100644
--- a/audio-libs/faad2/HISTORY
+++ b/audio-libs/faad2/HISTORY
@@ -1,3 +1,7 @@
+2007-09-29 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFLICTS: conflict with self, otherwise it fails when it was
+ previously built using gcc 3.4
+
2006-07-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: new WEB_SITE
* DETAILS, DEPENDS: don't need gcc34, builds fine with gcc-4.1.1



  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (80b615dd54fae55ed36e5cb754da7dd7e2b79718), Arwed von Merkatz, 09/29/2007

Archive powered by MHonArc 2.6.24.

Top of Page