]> git.alsa-project.org Git - alsa-utils.git/commitdiff
Merge branch 'ucm'
authorJaroslav Kysela <perex@perex.cz>
Mon, 24 Jan 2011 14:00:26 +0000 (15:00 +0100)
committerJaroslav Kysela <perex@perex.cz>
Mon, 24 Jan 2011 14:00:26 +0000 (15:00 +0100)
1  2 
Makefile.am
configure.in

diff --cc Makefile.am
Simple merge
diff --cc configure.in
Simple merge