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

Merge branch 'master' into release

Conflicts:

	debian/changelog.hardy
	debian/changelog.jaunty
	debian/control.intrepid
	src/plug-in/audiorecorder/audiorecord.h
parents 28dc4ed4 7b1ee3bd
Branches
Tags
No related merge requests found
Showing
with 160 additions and 1083 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment