On 2/1/07, Colin Whittaker <[EMAIL PROTECTED]> wrote: > Looks like someone checked in tport_tag.h with some unresolved conflicts....
> Around line 394: There was a problem with your TPTAG_TOS and Roman's TPTAG_LOG patches. As far as I remember I unrecorded Roman's patch and re-recorded it, so it should not be in conflict with yours. Are you sure you don't have a private patch or changes of your own in the repository? What says darcs w libsofia-sip-ua/tport/sofia-sip/tport_tag.h darcs changes --from-tag rel-sofia-sip-1.12.4 ? What says darcs check And do you have recent version of darcs? I'm using 1.0.8. -- Pekka.Pessi mail at nokia.com ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier. Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Sofia-sip-devel mailing list Sofia-sip-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/sofia-sip-devel
