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

fe9ec04f

Commit fe9ec04f authored 16 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'master' into m_savard

parents a0455278 5840e4df

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-gtk/src/actions.c 5 additions, 4 deletions

sflphone-gtk/src/actions.c
src/sdp.cpp 0 additions, 2 deletions

src/sdp.cpp
src/sipvoiplink.cpp 0 additions, 5 deletions

src/sipvoiplink.cpp

with 5 additions and 11 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