Merge svn changes up to r30732
commitacdce0176ae3722ad38a23aae0cf0bf03a82f9c4
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 9 Mar 2010 23:25:15 +0000 (10 01:25 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 9 Mar 2010 23:25:15 +0000 (10 01:25 +0200)
tree57a30f1d44ea193586d5723faac7ffb96a3a73aa
parentef3ef5e218588b5f68b427729a3c2c1a8083e499
parent5a2289137f43501281dba83fe98b5f67be63f9ef
Merge svn changes up to r30732
14 files changed:
Makefile
configure
etc/codecs.conf
libao2/ao_pcm.c
libmpdemux/demux_audio.c
mencoder.c
mp3lib/sr1.c
mp_msg.c
osdep/getch2.h
osdep/timer-darwin.c
parser-mpcmd.c
stream/stream_cddb.c
stream/vcd_read.h
stream/vcd_read_fbsd.h