]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
whoops from merge conflict
authorMichael Jerris <mike@jerris.com>
Tue, 29 Jan 2008 21:15:25 +0000 (21:15 +0000)
committerMichael Jerris <mike@jerris.com>
Tue, 29 Jan 2008 21:15:25 +0000 (21:15 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7430 d0543943-73ff-0310-b7d9-9358b9ac24b2

libs/sofia-sip/.update
libs/sofia-sip/libsofia-sip-ua/su/su_root.c

index b6492828e97d292178d0e9cdaba55a4045a479b0..0faf16f242db852fa50348707eaa810372551600 100644 (file)
@@ -1 +1 @@
-Sat Jan 26 14:48:35 EST 2008
+Tue Jan 29 16:15:12 EST 2008
index b17ef400e026cb5e26c91f97988bb1595e9ca7ea..86c8b5d168ba466e022d144e896c1a3dfcb72a2d 100644 (file)
@@ -1049,7 +1049,6 @@ void su_msg_destroy(su_msg_r rmsg)
   su_msg_t *msg;
 
   assert(rmsg);
-  rmsg[0] = NULL;
 
   msg = rmsg[0], rmsg[0] = NULL;