Commit 4dd3b363 authored 16 years ago by Emmanuel Milou

Merge branch 'master' into release

Conflicts:

	debian/changelog.hardy
	debian/changelog.jaunty
	debian/control.intrepid
	src/plug-in/audiorecorder/audiorecord.h

No related branches found

No related tags found

No related merge requests found

Showing with 160 additions and 1083 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.

Please register or to comment