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

0843e604

Commit 0843e604 authored 9 years ago by Joshua Colp Committed by Gerrit Code Review 9 years ago

Downloads
- Plain Diff

Merge "Confbridge: Add a user timeout option" into 13

parents 7debb986 fdd2afcd

Branches

Tags

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES 7 additions, 0 deletions

CHANGES
apps/app_confbridge.c 18 additions, 0 deletions

apps/app_confbridge.c
apps/confbridge/conf_config_parser.c 4 additions, 0 deletions

apps/confbridge/conf_config_parser.c
apps/confbridge/include/confbridge.h 2 additions, 0 deletions

apps/confbridge/include/confbridge.h
configs/samples/confbridge.conf.sample 6 additions, 0 deletions

configs/samples/confbridge.conf.sample

with 37 additions and 0 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