Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

A

asterisk
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

ece4c957

Commit ece4c957 authored 12 years ago by Mark Michelson

Downloads
- Patches
- Plain Diff

Resolve conflict and reset automerge.


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

parent 7b5f4748

No related branches found

No related tags found

No related merge requests found

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

channels/chan_sip.c 7 additions, 4 deletions

channels/chan_sip.c
channels/sip/include/sip.h 2 additions, 1 deletion

channels/sip/include/sip.h
configs/sip.conf.sample 2 additions, 0 deletions

configs/sip.conf.sample
configure 898 additions, 988 deletions

configure
configure.ac 1 addition, 6 deletions

configure.ac
include/asterisk/autoconfig.h.in 0 additions, 3 deletions

include/asterisk/autoconfig.h.in
main/taskprocessor.c 6 additions, 1 deletion

main/taskprocessor.c
main/utils.c 2 additions, 8 deletions

main/utils.c
res/res_calendar_exchange.c 14 additions, 19 deletions

res/res_calendar_exchange.c
res/res_clialiases.c 4 additions, 1 deletion

res/res_clialiases.c

with 936 additions and 1031 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment