sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (3ab907cbcb5a68664129dfe3461c86788ce53c4e)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (3ab907cbcb5a68664129dfe3461c86788ce53c4e)
- Date: Wed, 24 Sep 2008 11:37:50 -0500
GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:
libs/bluez-libs/CONFLICTS | 1 +
libs/bluez-libs/HISTORY | 5 ++++-
libs/bluez-sdp/CONFLICTS | 1 +
libs/bluez-sdp/HISTORY | 4 +++-
4 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 3ab907cbcb5a68664129dfe3461c86788ce53c4e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
bluez-sdp: conflict with bluez
commit ccf6bbb61461a8340d13c34835cdc22e8eee12b2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
bluez-libs: conflict with bluez
diff --git a/libs/bluez-libs/CONFLICTS b/libs/bluez-libs/CONFLICTS
index 62765ce..451f8e7 100755
--- a/libs/bluez-libs/CONFLICTS
+++ b/libs/bluez-libs/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts bluez &&
conflicts bluez-sdp &&
conflicts bluez-bluefw &&
conflicts bluez-pan
diff --git a/libs/bluez-libs/HISTORY b/libs/bluez-libs/HISTORY
index eceb12f..829ed52 100644
--- a/libs/bluez-libs/HISTORY
+++ b/libs/bluez-libs/HISTORY
@@ -1,3 +1,6 @@
+2008-09-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFLICTS: conflict with bluez
+
2008-07-11 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.36, quoting the paths!
@@ -54,7 +57,7 @@
2006-07-21 Bearcat M. Sandor <sourcemage AT feline-soul.com>
* DETAILS: updated to 3.1, added and utilized gpg key
-
+
2006-04-18 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: updated to 2.25
diff --git a/libs/bluez-sdp/CONFLICTS b/libs/bluez-sdp/CONFLICTS
new file mode 100644
index 0000000..2cf16d0
--- /dev/null
+++ b/libs/bluez-sdp/CONFLICTS
@@ -0,0 +1 @@
+conflicts bluez
diff --git a/libs/bluez-sdp/HISTORY b/libs/bluez-sdp/HISTORY
index c601a0d..dcf4470 100644
--- a/libs/bluez-sdp/HISTORY
+++ b/libs/bluez-sdp/HISTORY
@@ -1,3 +1,6 @@
+2008-09-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFLICTS: conflict with bluez
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS
@@ -22,4 +25,3 @@
2002-12-15 Jose Bernardo Silva <josebernardo1 AT yahoo.com>
* Initial version
-
- [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (3ab907cbcb5a68664129dfe3461c86788ce53c4e), Vlad Glagolev, 09/24/2008
Archive powered by MHonArc 2.6.24.