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

sofia rebuild

This commit is contained in:
Anthony Minessale 2015-01-07 11:18:29 -06:00 committed by Michael Jerris
parent 0d030a0c5b
commit 287a6c3cb4
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/sofia-sip/.update
View File

@ -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