sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Robin Cook (c2ed825745f7b7b7f81a0c809aad9c8f85d84ac3)

From: Robin Cook <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (c2ed825745f7b7b7f81a0c809aad9c8f85d84ac3)
Date: Sun, 31 Oct 2010 17:37:12 -0500

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

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

New commits:
commit c2ed825745f7b7b7f81a0c809aad9c8f85d84ac3
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

upower: added CONFLICTS

diff --git a/libs/upower/CONFLICTS b/libs/upower/CONFLICTS
new file mode 100755
index 0000000..f6d8538
--- /dev/null
+++ b/libs/upower/CONFLICTS
@@ -0,0 +1 @@
+conflicts devicekit-power
diff --git a/libs/upower/HISTORY b/libs/upower/HISTORY
index 22cd444..eed584e 100644
--- a/libs/upower/HISTORY
+++ b/libs/upower/HISTORY
@@ -1,3 +1,6 @@
+2010-10-31 Robin Cook <rcook AT wyrms.net>
+ * CONFLICTS: added
+
2010-10-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.6

[SM-Commit] GIT changes to master grimoire by Robin Cook (c2ed825745f7b7b7f81a0c809aad9c8f85d84ac3), Robin Cook, 10/31/2010