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

a9685d37

Commit a9685d37 authored 14 years ago by Alexandre Savard

Downloads
- Plain Diff

Merge branch 'master' into m_savard

Conflicts:
	sflphone-common/src/managerimpl.cpp

parents 9d36298d 3b5050a5

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

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

sflphone-client-gnome/src/actions.c
sflphone-client-gnome/src/actions.h 1 addition, 1 deletion

sflphone-client-gnome/src/actions.h
sflphone-client-gnome/src/config/accountconfigdialog.c 3 additions, 3 deletions

sflphone-client-gnome/src/config/accountconfigdialog.c
sflphone-common/src/managerimpl.cpp 11 additions, 10 deletions

sflphone-common/src/managerimpl.cpp

with 19 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