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

20375709

Commit 20375709 authored 14 years ago by Alexandre Savard

Downloads
- Plain Diff

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

parents ef339abd 73a3c5a3

No related branches found

No related tags found

No related merge requests found

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

hudson-sflphone-script.sh 1 addition, 1 deletion

hudson-sflphone-script.sh
sflphone-common/src/audio/codecs/audiocodecfactory.cpp 4 additions, 0 deletions

sflphone-common/src/audio/codecs/audiocodecfactory.cpp
sflphone-common/src/plug-in/pluginmanager.cpp 15 additions, 3 deletions

sflphone-common/src/plug-in/pluginmanager.cpp
sflphone-common/test/Makefile.am 3 additions, 0 deletions

sflphone-common/test/Makefile.am
sflphone-common/test/pluginmanagertest.cpp 16 additions, 17 deletions

sflphone-common/test/pluginmanagertest.cpp
sflphone-common/test/pluginmanagertest.h 2 additions, 0 deletions

sflphone-common/test/pluginmanagertest.h

with 41 additions and 21 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