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

6b2f9a06

Commit 6b2f9a06 authored 16 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'master' into release

parents 6a6c9954 af6915a2

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

configure.ac 12 additions, 4 deletions

configure.ac
src/audio/codecs/Makefile.am 6 additions, 2 deletions

src/audio/codecs/Makefile.am
src/audio/codecs/speexcodec.cpp 104 additions, 106 deletions

src/audio/codecs/speexcodec.cpp
www/features.php 1 addition, 1 deletion

www/features.php
www/index.php 1 addition, 1 deletion

www/index.php

with 124 additions and 114 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