sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Arjan Bouter (1be471c23887e6ae9c0d96c8f5d59942c6bd8a9f)

From: Arjan Bouter <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (1be471c23887e6ae9c0d96c8f5d59942c6bd8a9f)
Date: Fri, 24 Apr 2009 09:09:15 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

lxde/lxsession-lite/CONFLICTS | 1 +
lxde/lxsession-lite/HISTORY | 1 +
lxde/lxsession-lite/TRIGGERS | 1 -
3 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b15b5837e6d1074492c6993ec2ac5a7155a8d851
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

lxsession-lite: conflict with lxsession

diff --git a/lxde/lxsession-lite/CONFLICTS b/lxde/lxsession-lite/CONFLICTS
new file mode 100755
index 0000000..65d09f5
--- /dev/null
+++ b/lxde/lxsession-lite/CONFLICTS
@@ -0,0 +1 @@
+conflicts lxsession y
diff --git a/lxde/lxsession-lite/HISTORY b/lxde/lxsession-lite/HISTORY
index 3bc4bcd..29ba502 100644
--- a/lxde/lxsession-lite/HISTORY
+++ b/lxde/lxsession-lite/HISTORY
@@ -1,2 +1,3 @@
2009-04-24 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS, DETAILS, HISTORY: created spell
+ * CONFLICTS: added
diff --git a/lxde/lxsession-lite/TRIGGERS b/lxde/lxsession-lite/TRIGGERS
deleted file mode 100755
index 5f65cb7..0000000
--- a/lxde/lxsession-lite/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast $SPELL dispel lxsession

[SM-Commit] GIT changes to master grimoire by Arjan Bouter (1be471c23887e6ae9c0d96c8f5d59942c6bd8a9f), Arjan Bouter, 04/24/2009