Wim Taymans 0ac9bb7d99 Merge branch 'master' into 0.11 ...

Conflicts:
	tests/examples/audio/Makefile.am
	tests/examples/v4l/Makefile.am

2011-06-10 12:14:57 +02:00

..

.gitignore

audio: move testchannels example to 'tests/examples' dir

2011-05-27 15:09:25 +03:00

Makefile.am

Merge branch 'master' into 0.11

2011-06-10 12:14:57 +02:00

testchannels.c

audio: move testchannels example to 'tests/examples' dir

2011-05-27 15:09:25 +03:00