Mark Michelson ece4c95798 Resolve conflict and reset automerge. ...

git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377980 65c4cc65-6c06-0410-ace0-fbb531ad65f3

2012-12-13 16:39:40 +00:00

..

config_parser.h

Add auto_force_rport and auto_comedia NAT options

2012-02-09 18:14:39 +00:00

dialog.h

logger: Adds additional support for call id logging and chan_sip specific stuff

2012-05-17 16:28:20 +00:00

dialplan_functions.h

Make all of the various rtpqos parameters in this branch available from the CHANNEL function.

2010-02-17 06:25:15 +00:00

globals.h

Asterisk media architecture conversion - no more format bitfields

2011-02-03 16:22:10 +00:00

reqresp_parser.h

Update reqresp_parser parse_uri doxygen comments.

2011-11-14 19:03:29 +00:00

sdp_crypto.h

Doxygen Updates - janitor work

2012-09-21 17:14:59 +00:00

security_events.h

Merged revisions 337595,337597 via svnmerge from

2011-09-22 16:35:20 +00:00

sip_utils.h

Add auto_force_rport and auto_comedia NAT options

2012-02-09 18:14:39 +00:00

sip.h

Resolve conflict and reset automerge.

2012-12-13 16:39:40 +00:00

srtp.h

Clean up doxygen warnings

2012-08-30 14:23:28 +00:00