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

ca50d0a0

Commit ca50d0a0 authored 15 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'conference'

parents cf42cfd1 5f4810cd

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-client-gnome/doc/C/figures/conference.png 0 additions, 0 deletions

sflphone-client-gnome/doc/C/figures/conference.png
sflphone-client-gnome/doc/C/figures/conference_attached.png 0 additions, 0 deletions

sflphone-client-gnome/doc/C/figures/conference_attached.png
sflphone-client-gnome/doc/C/figures/conference_detached.png 0 additions, 0 deletions

sflphone-client-gnome/doc/C/figures/conference_detached.png
sflphone-client-gnome/doc/C/figures/drag_n_drop.png 0 additions, 0 deletions

sflphone-client-gnome/doc/C/figures/drag_n_drop.png
sflphone-client-gnome/doc/C/sflphone.xml 54 additions, 8 deletions

sflphone-client-gnome/doc/C/sflphone.xml
sflphone-client-gnome/doc/Makefile.am 9 additions, 5 deletions

sflphone-client-gnome/doc/Makefile.am
sflphone-common/src/iax/iaxvoiplink.cpp 1 addition, 0 deletions

sflphone-common/src/iax/iaxvoiplink.cpp

with 64 additions and 13 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