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

819f7661

Commit 819f7661 authored 14 years ago by Alexandre Savard

Downloads
- Plain Diff

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

parents 6f48de92 1ac2cc42

No related branches found

No related tags found

No related merge requests found

Changes 5

Show whitespace changes

Inline Side-by-side

Showing

hudson-sflphone-script.sh 6 additions, 6 deletions

hudson-sflphone-script.sh
sflphone-common/test/Makefile.am 3 additions, 3 deletions

sflphone-common/test/Makefile.am
sflphone-common/test/historytest.cpp 4 additions, 4 deletions

sflphone-common/test/historytest.cpp
sflphone-common/test/hookmanagertest.cpp 2 additions, 2 deletions

sflphone-common/test/hookmanagertest.cpp
sflphone-common/test/sflphoned-sample.yml 1 addition, 1 deletion

sflphone-common/test/sflphoned-sample.yml

with 16 additions and 16 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