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

e03fc896

Commit e03fc896 authored 16 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'master' into m_savard

parents 1a2ca73f 6ee702d8

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

configure.ac 6 additions, 7 deletions

configure.ac
debian/control.intrepid 1 addition, 1 deletion

debian/control.intrepid
debian/control.jaunty 1 addition, 1 deletion

debian/control.jaunty
po/fr.po 1 addition, 1 deletion

po/fr.po
sflphone-gtk/src/configwindow.c 1 addition, 1 deletion

sflphone-gtk/src/configwindow.c
src/Makefile.am 1 addition, 2 deletions

src/Makefile.am
src/managerimpl.cpp 1 addition, 1 deletion

src/managerimpl.cpp
src/sipaccount.cpp 8 additions, 8 deletions

src/sipaccount.cpp
src/sipvoiplink.cpp 6 additions, 10 deletions

src/sipvoiplink.cpp
src/user_cfg.h 1 addition, 1 deletion

src/user_cfg.h

with 27 additions and 33 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