Preston_PLB
/
freeswitch
forked from Mirrors/freeswitch
1
0
Fork 0
Code Pull Requests Activity

sofia rebuild

This commit is contained in:
Anthony Minessale 2015-01-12 11:34:57 -06:00 committed by Michael Jerris
parent bc24e0f28a
commit b9d64cc206
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/sofia-sip/.update
View File

@ -1,9 +1,12 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Wed Feb 11 12:35:25 EST 2015
=======
=======
>>>>>>> sofia rebuild
=======
>>>>>>> sofia rebuild
<<<<<<< HEAD
Wed Jan 7 11:24:56 PST 2015
=======
@ -15,4 +18,9 @@ Tue Jan 6 20:12:24 CST 2015
=======
Wed Jan 7 11:18:02 CST 2015
>>>>>>> sofia rebuild
<<<<<<< HEAD
=======
=======
Mon Jan 12 11:34:52 CST 2015
>>>>>>> sofia rebuild
>>>>>>> sofia rebuild