[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (bf1514537c6bf69d943b9ad5fb2ddb344aacd97b)
Ladislav Hagara
scm at sourcemage.org
Tue Feb 28 16:33:21 EST 2012
GIT changes to master grimoire by Ladislav Hagara <hgr at vabo.cz>:
devel/cmake/CONFLICTS | 1 -
devel/cmake/HISTORY | 3 +++
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit bf1514537c6bf69d943b9ad5fb2ddb344aacd97b
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>
cmake: CONFLICTS removed
diff --git a/devel/cmake/CONFLICTS b/devel/cmake/CONFLICTS
deleted file mode 100755
index 9761cb5..0000000
--- a/devel/cmake/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts colormake
diff --git a/devel/cmake/HISTORY b/devel/cmake/HISTORY
index c478fb4..4d59f05 100644
--- a/devel/cmake/HISTORY
+++ b/devel/cmake/HISTORY
@@ -1,3 +1,6 @@
+2012-02-28 Ladislav Hagara <hgr at vabo.cz>
+ * CONFLICTS: removed, colormake now install colormake not cmake
+
2012-02-05 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
* BUILD: activated parallel bootstrap
More information about the SM-Commit
mailing list