]> 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: 0d030a0)
sofia rebuild
authorAnthony Minessale <anthm@freeswitch.org>
Wed, 7 Jan 2015 17:18:29 +0000 (11:18 -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 07dc3e7bc0a983d3cf69688744186f823e8f65fd..c5d4dc7b822567df6a611c980a7e815a9bcf98c6 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1,9 +1,18 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 Wed Feb 11 12:35:25 EST 2015
 =======
+=======
+>>>>>>> sofia rebuild
 <<<<<<< HEAD
 Wed Jan  7 11:24:56 PST 2015
 =======
 Tue Jan  6 20:12:24 CST 2015
 >>>>>>> sofia update
+<<<<<<< HEAD
 >>>>>>> sofia update
+=======
+=======
+Wed Jan  7 11:18:02 CST 2015
+>>>>>>> sofia rebuild
+>>>>>>> sofia rebuild
Mirror of https://github.com/signalwire/freeswitch.git