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

e4d2eea0

Commit e4d2eea0 authored 16 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'master' into contact_list

Conflicts:

	sflphone-gtk/src/actions.c

parents fd955a66 9e7a215c

Branches

Tags

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

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

sflphone-gtk/src/actions.c
sflphone-gtk/src/dbus.c 1 addition, 1 deletion

sflphone-gtk/src/dbus.c
sflphone-gtk/src/menus.c 2 additions, 2 deletions

sflphone-gtk/src/menus.c
src/managerimpl.cpp 5 additions, 12 deletions

src/managerimpl.cpp
src/sipvoiplink.cpp 2 additions, 4 deletions

src/sipvoiplink.cpp

with 12 additions and 23 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