Cc: duane_malcolm <d.malcolm AT auckland.ac.nz>, Unet <unet AT sourcemage.org>, Andrew Stitt <a AT thefrayedknot.armory.com>, SM-Commit Daemon <sm-commit AT lists.ibiblio.org>, Ladislav Hagara <ladislav.hagara AT unob.cz>, Arjan Bouter <abouter AT sourcemage.org>, vladimir_marek <vlmarek AT volny.cz>, Maurizio Boriani <baux AT member.fsf.org>, Ethan Grammatikidis <eekee AT eekee.is-a-geek.org>, Gareth Clay <gareth AT caffeinefuelled.co.uk>
Subject: Re: [SM-Commit] PERFORCE change 78397 by jose_silva for review
Date: Tue, 25 Apr 2006 15:30:40 -0700
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Perforce Review Daemon wrote:
> Change 78397 by jose_silva@josesilva-portsmgl on 2006/04/25 16:48:56
>
> Had forgot to "p4 add" the CONFLICTS file
>
> Affected files ...
>
> ... //sgl/grimoires/devel/libs/openobex/CONFLICTS#1 add
openobex-apps should be properly deprecated in favour of openobex, then
(and openobex/CONFLICTS should auto-conflict with openobex-apps:
conflicts openobex-apps y).