Skip to content
Snippets Groups Projects
Commit eab073e1 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge branch 'stable' into pulseaudio 

Conflicts:

	debian/changelog
	debian/changelog.Debian.gz
	src/audio/audiortp.cpp
parents 7e22c53b 23bb2c9f
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 590 additions and 638 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment