sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
Re: [SM-Commit] GIT changes to master grimoire by Flavien Bridault (17d8ae3fbf1830d560df3e267cfd29ebdca46af1)
- From: Ladislav Hagara <ladislav.hagara AT unob.cz>
- To: Flavien Bridault <vlaaad AT sourcemage.org>
- Cc: sm-commit AT lists.ibiblio.org
- Subject: Re: [SM-Commit] GIT changes to master grimoire by Flavien Bridault (17d8ae3fbf1830d560df3e267cfd29ebdca46af1)
- Date: Fri, 28 Jul 2006 11:52:23 +0200
GIT changes to master grimoire by Flavien Bridault <vlaaad AT sourcemage.org>:
ChangeLog | 6 ++++++
diff --git a/ChangeLog b/ChangeLog
index e740020..9079fef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,15 @@
+<<<<<<< master
+2006-07-28 Flavien Bridault <vlaaad AT sourcemage.org>
+ * gnome2-apps/gcstar: New spell, collection management
+
+=======
2006-07-28 Kevin Dahan <unet AT sourcemage.org>
* audio-soft/clam-networkeditor: new spell
2006-07-28 Pieter Lenaerts <e-type AT sourcemage.org>
* utils/dbus-mono: new spell, mono bindings for dbus
+>>>>>>> origin
2006-07-27 Juuso Alasuutari <iuso AT sourcemage.org>
* audio-libs/dssi: New spell, API for audio processing plugins.
You probably did not want to commit these lines. :-)
+<<<<<<< master
+=======
+>>>>>>> origin
--
Ladislav Hagara
-
[SM-Commit] GIT changes to master grimoire by Flavien Bridault (17d8ae3fbf1830d560df3e267cfd29ebdca46af1),
Flavien Bridault, 07/28/2006
-
Re: [SM-Commit] GIT changes to master grimoire by Flavien Bridault (17d8ae3fbf1830d560df3e267cfd29ebdca46af1),
Ladislav Hagara, 07/28/2006
- Re: [SM-Commit] GIT changes to master grimoire by Flavien Bridault (17d8ae3fbf1830d560df3e267cfd29ebdca46af1), Flavien Bridault, 07/28/2006
-
Re: [SM-Commit] GIT changes to master grimoire by Flavien Bridault (17d8ae3fbf1830d560df3e267cfd29ebdca46af1),
Ladislav Hagara, 07/28/2006
Archive powered by MHonArc 2.6.24.