On Wed, 2002-11-13 at 23:10, Geetha Manjunath wrote:
> As you are aware, I branched out from the main devel sources around
> squid2.4STABLE2 and had continued development separately. I am planning
> to integrate back. Infact, I was waiting for Robert's content filter/esi
> changes to go into the HEAD to integrate the icap client functionality
> again with squid-devel.
They've been in HEAD for some time now :].
> Any suggestions for merging the sources ? Should I start again from
> squid-2.5STABLE2?
IMO you should integrate with 3.0.
Cheers,
Rob
This archive was generated by hypermail pre-2.1.9 : Tue Dec 09 2003 - 16:18:42 MST