Source Mage code commit list

[Flavien Bridault <vlaaad AT sourcemage.org>]

Le vendredi 28 juillet 2006 à 11:52 +0200, Ladislav Hagara a écrit :
> >
> > 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
> 
Mmmm I'm not yet well familiar with conflicts management with cogito. I
didn't noticed that. I'm going to correct this, thanks. :)
-- 
Flavien Bridault

Disk, Graphics, Graphics-libs sections Guru
Source Mage GNU/Linux - http://www.sourcemage.org

irc: vlaaad
jabber: vlaaad AT amessage.be

Attachment: signature.asc
Description: Ceci est une partie de message numériquement signée