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

Robin Cook scm at sourcemage.org
Sun Oct 31 18:37:12 EDT 2010


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
 



More information about the SM-Commit mailing list