sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

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 (c2773c6405c60df8a473aa5ba0f94fa62d4360f4)
Date: Tue, 26 Aug 2008 23:11:09 -0500

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

http/dillo/CONFLICTS | 1 +
1 files changed, 1 insertion(+)

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

dillo: added missing CONFLICTS

diff --git a/http/dillo/CONFLICTS b/http/dillo/CONFLICTS
new file mode 100755
index 0000000..30c06cd
--- /dev/null
+++ b/http/dillo/CONFLICTS
@@ -0,0 +1 @@
+conflicts dillo2

[SM-Commit] GIT changes to master grimoire by Arjan Bouter (c2773c6405c60df8a473aa5ba0f94fa62d4360f4), Arjan Bouter, 08/27/2008