[crossfire] gtk-v2/src/metaserver.c revision 6801 (metaserver2 mods)

[Nicolas Weeger]

>   I probably wouldn't worry about that much right now - 1.x and trunk are
> kept pretty closely in sync - at some point, that metaserver2 code is going
> to get merged down into the 1.x branch, so that bug in the trunk needs to
> get fixed, but I think all new/active development should be done on the
> trunk and not 1.x (otherwise you may find yourself in the reverse situation
> down the road - some new feature unique to 2.0 (trunk) is added, and you
> now need to rebase/merge up to that)

For client, couldn't we just forget branch?

AFAIK both trunk and branch are almost the same, and trunk client works fine, 
so I see no reason really to keep both.


Nicolas
-- 
http://nicolas.weeger.org [Petit site d'images, de textes, de code, bref de 
l'aléatoire !]
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part.
Url : http://mailman.metalforge.org/pipermail/crossfire/attachments/20070815/aa3383ea/attachment.pgp