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

0c62e0a5

Commit 0c62e0a5 authored 9 years ago by Joshua Colp Committed by Gerrit Code Review 9 years ago

Downloads
- Plain Diff

Merge "voicemail: Move app_voicemail / res_mwi_external conflict to runtime"

parents f88b9520 6d18fe15

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES 8 additions, 0 deletions

CHANGES
apps/app_voicemail.c 33 additions, 12 deletions

apps/app_voicemail.c
include/asterisk/app.h 2 additions, 0 deletions

include/asterisk/app.h
include/asterisk/module.h 1 addition, 1 deletion

include/asterisk/module.h
main/app.c 2 additions, 2 deletions

main/app.c
res/res_mwi_external.c 11 additions, 2 deletions

res/res_mwi_external.c

with 57 additions and 17 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