]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bcd5753)
FS-8761: [freeswitch-core] Memory leak in FreeSWITCH
authorAnthony Minessale <anthm@freeswitch.org>
Mon, 20 Nov 2017 21:23:54 +0000 (15:23 -0600)
committerMuteesa Fred <muteesafred@hotmail.com>
Tue, 24 Jul 2018 07:21:35 +0000 (07:21 +0000)
libs/sofia-sip/.update patch | blob | blame | history

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 4b6b39e5d04b4431c7f35185192e98ace3bd0830..1bb35370c6ed08f4e40d1ebbd9eb65856fe85e61 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Mon Jan 15 01:36:14 EST 2018
-=======
-Tue Nov 14 12:28:03 CST 2017
->>>>>>> 96a8ad2378... FS-10762: [freeswitch-core] Websocket logic error #resolve
+Mon Jan 15 01:37:50 EST 2018
Mirror of https://github.com/signalwire/freeswitch.git