]> 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: be16546)
sofia update
authorAnthony Minessale <anthm@freeswitch.org>
Wed, 7 Jan 2015 02:12:33 +0000 (20:12 -0600)
committerMichael Jerris <mike@jerris.com>
Thu, 28 May 2015 17:46:53 +0000 (12:46 -0500)
libs/sofia-sip/.update patch | blob | blame | history

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index f5b42d453cc5275c667f30709e698fb93d72ae8e..07dc3e7bc0a983d3cf69688744186f823e8f65fd 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1,9 @@
+<<<<<<< HEAD
 Wed Feb 11 12:35:25 EST 2015
+=======
+<<<<<<< HEAD
+Wed Jan  7 11:24:56 PST 2015
+=======
+Tue Jan  6 20:12:24 CST 2015
+>>>>>>> sofia update
+>>>>>>> sofia update
Mirror of https://github.com/signalwire/freeswitch.git