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

fb081475

Commit fb081475 authored 17 years ago by Pierre-Luc Beaudoin

Downloads
- Plain Diff

Merge commit 'origin/master' into dbus

Conflicts:

	.gitignore
	src/Makefile.am
	src/managerimpl.cpp

parents 96868436 4be69b42

No related branches found

No related tags found

No related merge requests found

Changes 114

Show whitespace changes

Inline Side-by-side

Showing

libs/libiax2/src/jitterbuf.h 164 additions, 0 deletions

libs/libiax2/src/jitterbuf.h
libs/libiax2/src/md5.c 285 additions, 0 deletions

libs/libiax2/src/md5.c
libs/libiax2/src/md5.h 27 additions, 0 deletions

libs/libiax2/src/md5.h
libs/libiax2/src/miniphone.c 776 additions, 0 deletions

libs/libiax2/src/miniphone.c
libs/libiax2/src/miniphone.h 6 additions, 0 deletions

libs/libiax2/src/miniphone.h
libs/libiax2/src/options.c 137 additions, 0 deletions

libs/libiax2/src/options.c
libs/libiax2/src/options.h 23 additions, 0 deletions

libs/libiax2/src/options.h
libs/libiax2/src/ring10.h 1752 additions, 0 deletions

libs/libiax2/src/ring10.h
libs/libiax2/src/ringtone.h 30 additions, 0 deletions

libs/libiax2/src/ringtone.h
libs/libiax2/src/winiphone.c 761 additions, 0 deletions

libs/libiax2/src/winiphone.c
libs/libiax2/src/winpoop.h 41 additions, 0 deletions

libs/libiax2/src/winpoop.h
src/Makefile.am 8 additions, 4 deletions

src/Makefile.am
src/account.cpp 26 additions, 3 deletions

src/account.cpp
src/account.h 17 additions, 13 deletions

src/account.h
src/accountcreator.h 8 additions, 8 deletions

src/accountcreator.h
src/audio/alaw.cpp 1 addition, 2 deletions

src/audio/alaw.cpp
src/audio/audiortp.cpp 4 additions, 4 deletions

src/audio/audiortp.cpp
src/audio/audiortp.h 7 additions, 2 deletions

src/audio/audiortp.h
src/audio/ulaw.cpp 1 addition, 2 deletions

src/audio/ulaw.cpp
src/call.h 20 additions, 3 deletions

src/call.h

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