retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

FS-7486 #resolve update sofia

This commit is contained in:
Anthony Minessale 2015-09-09 12:26:03 -05:00
parent c1f45cd3a8
commit ba5aa94ce8
1 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libs/sofia-sip/.update
View File

@ -1,26 +1 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Wed Feb 11 12:35:25 EST 2015
=======
=======
>>>>>>> sofia rebuild
=======
>>>>>>> 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
<<<<<<< HEAD
=======
=======
Mon Jan 12 11:34:52 CST 2015
>>>>>>> sofia rebuild
>>>>>>> sofia rebuild
Wed Sep 9 12:25:38 CDT 2015