Subject: Re: [SM-Commit] GIT changes to test grimoire by Treeve Jelbert (9265335a39ddc6218112993f08cb598eef619328)
Date: Mon, 19 Jun 2006 01:21:44 +0200
Le dimanche 18 juin 2006 à 15:48 -0500, Treeve Jelbert a écrit :
> GIT changes to test grimoire by Treeve Jelbert <treeve AT scarlet.be>:
>
> database/libiodbc/BUILD | 5 ++---
> database/libiodbc/CONFLICTS | 1 +
> database/libiodbc/DETAILS | 4 +---
> database/libiodbc/HISTORY | 5 +++++
> 4 files changed, 9 insertions(+), 6 deletions(-)
>
> New commits:
> commit 9265335a39ddc6218112993f08cb598eef619328
> Merge: ea93e3cd8e476537a7d5895089c1fba278696b70
> 04cd54b441fbf70b1ba514d6b1764ef071b9697c
> Author: Treeve Jelbert <treeve AT scarlet.be>
> Commit: Treeve Jelbert <treeve AT scarlet.be>
>
> Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
>
> commit ea93e3cd8e476537a7d5895089c1fba278696b70
> Author: Treeve Jelbert <treeve AT scarlet.be>
> Commit: Treeve Jelbert <treeve AT scarlet.be>
>
> libiodbc - add CONFLICTS
>
Was there a bug filed somewhere for this or did you discover that
problem yourself ?
I ask that because if I'm right, that should solve at least this one :-)