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

0460df83

Commit 0460df83 authored 16 years ago by Julien Bonjean

Downloads
- Plain Diff

Merge branch 'master' into jbonjean

parents 9ad04e2e c0efa978

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

debian/control.hardy 1 addition, 1 deletion

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

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

debian/control.jaunty
sflphone-gtk/configure.ac 18 additions, 6 deletions

sflphone-gtk/configure.ac
sflphone-gtk/globals.mak 9 additions, 8 deletions

sflphone-gtk/globals.mak
sflphone-gtk/src/Makefile.am 1 addition, 2 deletions

sflphone-gtk/src/Makefile.am
src/sipvoiplink.cpp 21 additions, 3 deletions

src/sipvoiplink.cpp
src/sipvoiplink.h 2 additions, 0 deletions

src/sipvoiplink.h

with 54 additions and 22 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