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

8f9fd2fb

Commit 8f9fd2fb authored 13 years ago by Tristan Matthews

Downloads
- Plain Diff

Merge branch 'master' into history_refactor

Resolved Conflicts:
	daemon/src/managerimpl.cpp

parents fd71ebc4 f97fdca0

No related branches found

No related tags found

No related merge requests found

Changes 38

Hide whitespace changes

Inline Side-by-side

Showing

daemon/src/audio/alsa/alsalayer.cpp 37 additions, 12 deletions

daemon/src/audio/alsa/alsalayer.cpp
daemon/src/audio/alsa/alsalayer.h 13 additions, 8 deletions

daemon/src/audio/alsa/alsalayer.h
daemon/src/audio/audiolayer.h 17 additions, 0 deletions

daemon/src/audio/audiolayer.h
daemon/src/audio/pulseaudio/audiostream.cpp 5 additions, 5 deletions

daemon/src/audio/pulseaudio/audiostream.cpp
daemon/src/audio/pulseaudio/audiostream.h 1 addition, 1 deletion

daemon/src/audio/pulseaudio/audiostream.h
daemon/src/audio/pulseaudio/pulselayer.cpp 18 additions, 8 deletions

daemon/src/audio/pulseaudio/pulselayer.cpp
daemon/src/audio/pulseaudio/pulselayer.h 13 additions, 4 deletions

daemon/src/audio/pulseaudio/pulselayer.h
daemon/src/managerimpl.cpp 6 additions, 6 deletions

daemon/src/managerimpl.cpp
daemon/src/sip/sipaccount.cpp 48 additions, 2 deletions

daemon/src/sip/sipaccount.cpp
daemon/src/sip/sipaccount.h 54 additions, 4 deletions

daemon/src/sip/sipaccount.h
daemon/src/sip/sipvoiplink.cpp 26 additions, 2 deletions

daemon/src/sip/sipvoiplink.cpp
daemon/src/sip/sipvoiplink.h 10 additions, 0 deletions

daemon/src/sip/sipvoiplink.h
gnome/src/config/audioconf.c 27 additions, 22 deletions

gnome/src/config/audioconf.c
gnome/src/widget/imwidget.c 2 additions, 1 deletion

gnome/src/widget/imwidget.c
lang/ar.po 1 addition, 1 deletion

lang/ar.po
lang/ast.po 5 additions, 5 deletions

lang/ast.po
lang/ca.po 8 additions, 6 deletions

lang/ca.po
lang/da.po 6 additions, 5 deletions

lang/da.po
lang/de.po 6 additions, 5 deletions

lang/de.po
lang/el.po 3 additions, 4 deletions

lang/el.po

with 306 additions and 101 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