summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2007-12-30 18:37:29 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2007-12-30 18:37:29 +0000
commitcb2f69533fd5771c386d1b994b2179e76c4ded54 (patch)
tree98f4f9bff7afd6e9f0ce2c50b01d1e5ad55ec539 /m4
parent6dbb05a4cba3cdc811308762058d722f11464683 (diff)
parentaa3d3aacdb991ad989933d71734e300535c7d350 (diff)
downloadxine-lib-cb2f69533fd5771c386d1b994b2179e76c4ded54.tar.gz
xine-lib-cb2f69533fd5771c386d1b994b2179e76c4ded54.tar.bz2
Merge from 1.1 (except po/*; translators needed for this).
--HG-- rename : src/video_out/vidix/drivers/mga_vid.c => contrib/vidix/drivers/mga_vid.c rename : src/video_out/vidix/drivers/nvidia_vid.c => contrib/vidix/drivers/nvidia_vid.c rename : src/video_out/vidix/drivers/savage_vid.c => contrib/vidix/drivers/savage_vid.c rename : src/xine-engine/video_out.h => include/xine/video_out.h rename : src/xine-utils/xmllexer.h => include/xine/xmllexer.h rename : po/libxine1.pot => po/libxine2.pot rename : src/libsputext/xine_sputext_decoder.c => src/spu_dec/sputext_decoder.c rename : src/libsputext/demux_sputext.c => src/spu_dec/sputext_demuxer.c
Diffstat (limited to 'm4')
0 files changed, 0 insertions, 0 deletions