Michael Jerris 153015f770 merge conflict fix ... git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7329 d0543943-73ff-0310-b7d9-9358b9ac24b2		2008-01-23 18:42:49 +00:00
..
bnf	prepend su_ to inet_ntop and inet_pton replacement functions to work around problematic msvc 9 headers	2007-12-11 10:45:05 +00:00
docs	merge to sofia sip darcs tree. Includes multiple fixes and several merges of changes from the freeswitch tree back to darcs as follows:	2008-01-23 18:37:33 +00:00
features	sync with latest sofia tree.	2007-08-06 19:24:10 +00:00
http	Merge up to current sofia-sip darcs.	2007-11-19 18:09:15 +00:00
ipt	Merge up to current sofia-sip darcs.	2007-11-19 18:09:15 +00:00
iptsec	merge to sofia sip darcs tree. Includes multiple fixes and several merges of changes from the freeswitch tree back to darcs as follows:	2008-01-23 18:37:33 +00:00
msg	Merge up to current sofia-sip darcs.	2007-11-19 18:09:15 +00:00
nea	merge with sofia darcs trunk:	2007-11-12 16:04:47 +00:00
nta	merge to sofia sip darcs tree. Includes multiple fixes and several merges of changes from the freeswitch tree back to darcs as follows:	2008-01-23 18:37:33 +00:00
nth	prepend su_ to inet_ntop and inet_pton replacement functions to work around problematic msvc 9 headers	2007-12-11 10:45:05 +00:00
nua	merge to sofia sip darcs tree. Includes multiple fixes and several merges of changes from the freeswitch tree back to darcs as follows:	2008-01-23 18:37:33 +00:00
sdp	Sync to current darcs tree:	2007-10-11 14:16:59 +00:00
sip	merge to sofia sip darcs tree. Includes multiple fixes and several merges of changes from the freeswitch tree back to darcs as follows:	2008-01-23 18:37:33 +00:00
soa	merge to sofia sip darcs tree. Includes multiple fixes and several merges of changes from the freeswitch tree back to darcs as follows:	2008-01-23 18:37:33 +00:00
sresolv	merge to sofia sip darcs tree. Includes multiple fixes and several merges of changes from the freeswitch tree back to darcs as follows:	2008-01-23 18:37:33 +00:00
stun	Merge current sofia-sip darcs tree:	2008-01-06 20:15:11 +00:00
su	merge conflict fix	2008-01-23 18:42:49 +00:00
tport	merge to sofia sip darcs tree. Includes multiple fixes and several merges of changes from the freeswitch tree back to darcs as follows:	2008-01-23 18:37:33 +00:00
url	sync to current darcs tree:	2007-12-06 18:44:14 +00:00
ChangeLog	sync to latest sofia-sip darcs tree	2007-05-08 19:14:10 +00:00
Makefile.am	Merge current sofia-sip darcs tree:	2008-01-06 20:15:11 +00:00
sofia.am	update to latest darcs sofia	2007-01-02 15:11:55 +00:00