[SM-Commit] GIT changes to master z-rejected grimoire by Pol Vinogradov (f96b5d5114ff189a336a074a5ba954e285909a79)

Alexander Tsamutali astsmtl at gmail.com
Fri Dec 21 01:12:26 EST 2007


2007/12/21, Pol Vinogradov <scm at sourcemage.org>:
> GIT changes to master z-rejected grimoire by Pol Vinogradov <vin.public at gmail.com>:
>
>  z-http/icecat-bin/CONFLICTS |    3 ++-
>  z-http/icecat-bin/HISTORY   |    3 +++
>  2 files changed, 5 insertions(+), 1 deletion(-)
>
> New commits:
> commit b32c8bb6ddbb9e99b4658e73eb7fb01f9dd63f03
> Author: Pol Vinogradov <vin.public at gmail.com>
> Commit: Pol Vinogradov <vin.public at gmail.com>
>
>     z-http/icecat-bin:
>
>     CONFLICTS: added icecat

Is it really necessary? They install to different locations and they
have different launch scripts. FYI firefox-bin doen't conflict with
firefox.


-- 
Alexander Tsamutali



More information about the SM-Commit mailing list