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

f5e9cf59

Commit f5e9cf59 authored 12 years ago by Mark Michelson

Downloads
- Patches
- Plain Diff

Add automerge property back after conflict.


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

parent 603bf530

No related branches found

No related tags found

No related merge requests found

Changes 9

Expand all Hide whitespace changes

Inline Side-by-side

Showing

configure 7626 additions, 34988 deletions

configure
configure.ac 2 additions, 1 deletion

configure.ac
include/asterisk/autoconfig.h.in 8 additions, 5 deletions

include/asterisk/autoconfig.h.in
include/asterisk/uuid.h 107 additions, 0 deletions

include/asterisk/uuid.h
main/Makefile 1 addition, 1 deletion

main/Makefile
main/asterisk.c 2 additions, 0 deletions

main/asterisk.c
main/udptl.c 7 additions, 3 deletions

main/udptl.c
main/uuid.c 206 additions, 0 deletions

main/uuid.c
tests/test_uuid.c 136 additions, 0 deletions

tests/test_uuid.c

with 8095 additions and 34998 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