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

c31f0f29

Commit c31f0f29 authored 13 years ago by Alexandre Savard

Downloads
- Plain Diff

Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

parents 8e0d81e0 5af5f4aa

Branches

Tags

No related merge requests found

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

daemon/src/global.h 1 addition, 1 deletion

daemon/src/global.h
daemon/src/preferences.cpp 5 additions, 5 deletions

daemon/src/preferences.cpp
daemon/test/audiolayertest.cpp 8 additions, 8 deletions

daemon/test/audiolayertest.cpp
daemon/test/configurationtest.cpp 4 additions, 4 deletions

daemon/test/configurationtest.cpp
tools/build-system/launch-build-machine-2.sh 3 additions, 4 deletions

tools/build-system/launch-build-machine-2.sh
tools/build-system/launchpad/sflphone-client-kde/debian/changelog 22 additions, 0 deletions

...ild-system/launchpad/sflphone-client-kde/debian/changelog
tools/build-system/launchpad/sflphone-client-kde/debian/control 1 addition, 1 deletion

...build-system/launchpad/sflphone-client-kde/debian/control

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