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

sofia update

This commit is contained in:
Anthony Minessale 2015-01-06 20:12:33 -06:00 committed by Michael Jerris
parent be1654667c
commit 0d030a0c5b
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 +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