Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

jami-daemon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Releases
- Model registry
- Incidents

Snippets Groups Projects

59254cb2

Commit 59254cb2 authored 15 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'pierre-luc' of git+ssh://repos-sflphone-git@sflphone.org/~/sflphone into pierre-luc

parents 466f442b f7ac1932

Branches

Tags

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-common/libs/pjproject-1.0.3/pjlib-util/include/pjlib-util/srv_resolver.h 13 additions, 1 deletion

...roject-1.0.3/pjlib-util/include/pjlib-util/srv_resolver.h
sflphone-common/libs/pjproject-1.0.3/pjlib-util/src/pjlib-util/srv_resolver.c 51 additions, 10 deletions

.../pjproject-1.0.3/pjlib-util/src/pjlib-util/srv_resolver.c
sflphone-common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_resolve.c 11 additions, 5 deletions

...common/libs/pjproject-1.0.3/pjsip/src/pjsip/sip_resolve.c

with 75 additions and 16 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