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

61ec6b7c

Commit 61ec6b7c authored 16 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'master' of http://sflphone.org/git/sflphone

parents 74c330d8 576d4b97

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

configure.ac 1 addition, 1 deletion

configure.ac
debian/changelog 16 additions, 0 deletions

debian/changelog
debian/rules 3 additions, 3 deletions

debian/rules
sflphone-gtk/configure.ac 4 additions, 4 deletions

sflphone-gtk/configure.ac
sflphone-gtk/src/contactlist/Makefile.am 3 additions, 3 deletions

sflphone-gtk/src/contactlist/Makefile.am
src/managerimpl.cpp 9 additions, 3 deletions

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

src/sipvoiplink.cpp
tools/build-package.sh 1 addition, 1 deletion

tools/build-package.sh

with 46 additions and 19 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