git.neil.brown.name Git - history.git/commit

]> git.neil.brown.name Git - history.git/commit

projects / history.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: db71a5a 1387c38)

author	Jaroslav Kysela <perex@suse.cz>
	Thu, 21 Aug 2003 00:08:25 +0000 (02:08 +0200)
committer	Jaroslav Kysela <perex@suse.cz>
	Thu, 21 Aug 2003 00:08:25 +0000 (02:08 +0200)
commit	451a4f7b09cf742828a07f81198ef48d1da67651
tree	54557dacc70991520294bd96d8251829b22ec325	tree \| snapshot
parent	db71a5a2b63a176d45ea5130bbbca73eb7ead15d	commit \| diff
parent	1387c386785d7f9021951014e20e842b328bcdaa	commit \| diff

Solved conflicts with ALSA CVS tree

12 files changed:

sound/isa/opl3sa2.c	diff1 \|	diff2 \|	blob \| history
sound/pci/azt3328.c	diff1 \|	diff2 \|	blob \| history
sound/pci/cs4281.c	diff1 \|	diff2 \|	blob \| history
sound/pci/ens1370.c	diff1 \|	diff2 \|	blob \| history
sound/pci/es1938.c	diff1 \|	diff2 \|	blob \| history
sound/pci/es1968.c	diff1 \|	diff2 \|	blob \| history
sound/pci/ice1712/ice1712.c	diff1 \|	diff2 \|	blob \| history
sound/pci/ice1712/ice1724.c	diff1 \|	diff2 \|	blob \| history
sound/pci/intel8x0.c	diff1 \|	diff2 \|	blob \| history
sound/pci/rme9652/hdsp.c	diff1 \|	diff2 \|	blob \| history
sound/pci/sonicvibes.c	diff1 \|	diff2 \|	blob \| history
sound/pci/via82xx.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.