sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Flavien Bridault (f04fc66d6745c6c465a53b5dc1d71668c66917ba)

From: Flavien Bridault <scm AT mail.sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Flavien Bridault (f04fc66d6745c6c465a53b5dc1d71668c66917ba)
Date: Fri, 28 Jul 2006 05:32:56 -0500

GIT changes to master grimoire by Flavien Bridault <vlaaad AT sourcemage.org>:

ChangeLog | 3 ---
1 files changed, 3 deletions(-)

New commits:
commit f04fc66d6745c6c465a53b5dc1d71668c66917ba
Author: Flavien Bridault <vlaaad AT sourcemage.org>
Commit: Flavien Bridault <vlaaad AT sourcemage.org>

Fixed conflict lines in Changelog

diff --git a/ChangeLog b/ChangeLog
index 9079fef..73c7412 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,12 @@
-<<<<<<< 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.

[SM-Commit] GIT changes to master grimoire by Flavien Bridault (f04fc66d6745c6c465a53b5dc1d71668c66917ba), Flavien Bridault, 07/28/2006