Author: mikej Date: Tue Jan 29 16:15:25 2008 New Revision: 7430 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c Log: whoops from merge conflict Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Jan 29 16:15:25 2008 @@ -1 +1 @@ -Sat Jan 26 14:48:35 EST 2008 +Tue Jan 29 16:15:12 EST 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c Tue Jan 29 16:15:25 2008 @@ -1049,7 +1049,6 @@ su_msg_t *msg; assert(rmsg); - rmsg[0] = NULL; msg = rmsg[0], rmsg[0] = NULL;