Merge svn change r31134
commit4c6e3ac01bb158ddaa5603dc93fc7efb91b367b1
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Fri, 7 May 2010 19:02:47 +0000 (7 22:02 +0300)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Fri, 7 May 2010 19:03:48 +0000 (7 22:03 +0300)
tree16662a6828f11f852ee4e0437ad03309d994caef
parenteee666c3b57870b7610acc846858814ce8498385
parenta535f7bfca1bec440cec45f4201494755ed2440b
Merge svn change r31134

Fix some search/replace errors introduced in the svn commit.
asxparser.c
asxparser.h
cfg-common-opts.h
cfg-common.h
cfg-mencoder.h
cfg-mplayer.h
codec-cfg.c
command.c
cpudetect.h