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

4bacb8d5

Commit 4bacb8d5 authored 12 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'master' into release

parents 23b04e09 b48d3e92

No related branches found

No related tags found

No related merge requests found

Changes 1000

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 2 additions, 4 deletions

.gitignore
.gitmodules 3 additions, 0 deletions

.gitmodules
build_tarball.sh 1 addition, 1 deletion

build_tarball.sh
daemon/README 19 additions, 1 deletion

daemon/README
daemon/configure.ac 172 additions, 38 deletions

daemon/configure.ac
daemon/doc/doxygen/Makefile.am 1 addition, 1 deletion

daemon/doc/doxygen/Makefile.am
daemon/globals.mak 1 addition, 3 deletions

daemon/globals.mak
daemon/libs/Makefile.am 2 additions, 0 deletions

daemon/libs/Makefile.am
daemon/libs/iax2/iax-client.h 1 addition, 0 deletions

daemon/libs/iax2/iax-client.h
daemon/libs/pjproject/Makefile 6 additions, 3 deletions

daemon/libs/pjproject/Makefile
daemon/libs/pjproject/aconfigure 140 additions, 9 deletions

daemon/libs/pjproject/aconfigure
daemon/libs/pjproject/aconfigure.ac 69 additions, 6 deletions

daemon/libs/pjproject/aconfigure.ac
daemon/libs/pjproject/build.mak.in 66 additions, 2 deletions

daemon/libs/pjproject/build.mak.in
daemon/libs/pjproject/build.symbian/00.bat 7 additions, 0 deletions

daemon/libs/pjproject/build.symbian/00.bat
daemon/libs/pjproject/build.symbian/01.bat 7 additions, 0 deletions

daemon/libs/pjproject/build.symbian/01.bat
daemon/libs/pjproject/build.symbian/bld.inf 37 additions, 0 deletions

daemon/libs/pjproject/build.symbian/bld.inf
daemon/libs/pjproject/build.symbian/libg7221codec.mmp 56 additions, 0 deletions

daemon/libs/pjproject/build.symbian/libg7221codec.mmp
daemon/libs/pjproject/build.symbian/libgsmcodec.mmp 72 additions, 0 deletions

daemon/libs/pjproject/build.symbian/libgsmcodec.mmp
daemon/libs/pjproject/build.symbian/libpassthroughcodec.mmp 27 additions, 0 deletions

daemon/libs/pjproject/build.symbian/libpassthroughcodec.mmp
daemon/libs/pjproject/build.symbian/libresample.mmp 26 additions, 0 deletions

daemon/libs/pjproject/build.symbian/libresample.mmp

with 715 additions and 68 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

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