sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master games grimoire by Ismael Luceno (14ab0e611c45f2c68e5c08d7ed92d7df690630ce)
- From: Ismael Luceno <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master games grimoire by Ismael Luceno (14ab0e611c45f2c68e5c08d7ed92d7df690630ce)
- Date: Sat, 16 Mar 2013 16:48:05 -0500
GIT changes to master games grimoire by Ismael Luceno <ismael AT sourcemage.org>:
games-cards/pysol/CONFLICTS | 1 +
games-cards/pysol/HISTORY | 3 +++
2 files changed, 4 insertions(+)
New commits:
commit 14ab0e611c45f2c68e5c08d7ed92d7df690630ce
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
pysol: conflict with pysolfc
diff --git a/games-cards/pysol/CONFLICTS b/games-cards/pysol/CONFLICTS
new file mode 100755
index 0000000..e4c8c39
--- /dev/null
+++ b/games-cards/pysol/CONFLICTS
@@ -0,0 +1 @@
+conflicts pysolfc
diff --git a/games-cards/pysol/HISTORY b/games-cards/pysol/HISTORY
index 1b1d531..cc5f8c7 100644
--- a/games-cards/pysol/HISTORY
+++ b/games-cards/pysol/HISTORY
@@ -1,3 +1,6 @@
+2013-03-16 Ismael Luceno <ismael AT sourcemage.org>
+ * CONFLICTS: conflict with pysolfc
+
2006-09-21 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: [automated] Removed BUILD_API=2.
- [SM-Commit] GIT changes to master games grimoire by Ismael Luceno (14ab0e611c45f2c68e5c08d7ed92d7df690630ce), Ismael Luceno, 03/16/2013
Archive powered by MHonArc 2.6.24.