Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 devel/geanylua/CONFLICTS |    1 +
 devel/geanylua/HISTORY   |    3 +++
 devel/geanyvc/CONFLICTS  |    1 +
 devel/geanyvc/HISTORY    |    3 +++
 4 files changed, 8 insertions(+)

New commits:
commit 3c1946ee81ae321a31fde51ff302d362f4eabf1e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    geanyvc: conflicts with geany-plugins

commit a83988c16be84a444283724a687f6a1aea784ed2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    geanylua: conflicts with geany-plugins

diff --git a/devel/geanylua/CONFLICTS b/devel/geanylua/CONFLICTS
new file mode 100755
index 0000000..f2fa116
--- /dev/null
+++ b/devel/geanylua/CONFLICTS
@@ -0,0 +1 @@
+conflicts geany-plugins
diff --git a/devel/geanylua/HISTORY b/devel/geanylua/HISTORY
index 7468702..ac8d5aa 100644
--- a/devel/geanylua/HISTORY
+++ b/devel/geanylua/HISTORY
@@ -1,3 +1,6 @@
+2011-02-26 Vlad Glagolev <stealth AT sourcemage.org>
+       * CONFLICTS: added, conflicts with geany-plugins
+
 2008-07-15 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated website, fixed source url
        * PRE_BUILD: removed, useless
diff --git a/devel/geanyvc/CONFLICTS b/devel/geanyvc/CONFLICTS
new file mode 100755
index 0000000..f2fa116
--- /dev/null
+++ b/devel/geanyvc/CONFLICTS
@@ -0,0 +1 @@
+conflicts geany-plugins
diff --git a/devel/geanyvc/HISTORY b/devel/geanyvc/HISTORY
index 40ed277..66db49b 100644
--- a/devel/geanyvc/HISTORY
+++ b/devel/geanyvc/HISTORY
@@ -1,3 +1,6 @@
+2011-02-26 Vlad Glagolev <stealth AT sourcemage.org>
+       * CONFLICTS: added, conflicts with geany-plugins
+
 2009-02-27 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 0.5; fixed WEB_SITE