sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Bor Kraljič (20d73affc515ca7f53c5bd1b2743b89a1ffff40b)
- 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č (20d73affc515ca7f53c5bd1b2743b89a1ffff40b)
- Date: Fri, 19 Aug 2011 04:21:59 -0500
GIT changes to master grimoire by Bor Kraljič <pyrobor AT ver.si>:
libs/tbb/CONFLICTS | 1 +
libs/tbb/HISTORY | 3 +++
2 files changed, 4 insertions(+)
New commits:
commit 20d73affc515ca7f53c5bd1b2743b89a1ffff40b
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
tbb: conflict with self to avoid failure during INSTALL (fixes #46)
diff --git a/libs/tbb/CONFLICTS b/libs/tbb/CONFLICTS
new file mode 100755
index 0000000..cdf9246
--- /dev/null
+++ b/libs/tbb/CONFLICTS
@@ -0,0 +1 @@
+conflicts $SPELL y
diff --git a/libs/tbb/HISTORY b/libs/tbb/HISTORY
index 0e0766c..e837cd0 100644
--- a/libs/tbb/HISTORY
+++ b/libs/tbb/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: conflict with self to avoid failure during INSTALL
(fixes #46)
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
- [SM-Commit] GIT changes to master grimoire by Bor Kraljič (20d73affc515ca7f53c5bd1b2743b89a1ffff40b), Bor Kraljič, 08/19/2011
Archive powered by MHonArc 2.6.24.