diff options
author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-01 17:35:04 +0000 |
---|---|---|
committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-01 17:35:04 +0000 |
commit | f6ad0cf7c06e14f4f9e09e56a546db1692cfe09d (patch) | |
tree | 3889c94ee31c8c7a6f8a3bf97f70617476284e95 /m4 | |
parent | 9285ce63facf833394d79d4e5be6adfa4c70eac6 (diff) | |
parent | 284db4a4fc4941b7a3b903d3ab23b04840517fd1 (diff) | |
download | xine-lib-f6ad0cf7c06e14f4f9e09e56a546db1692cfe09d.tar.gz xine-lib-f6ad0cf7c06e14f4f9e09e56a546db1692cfe09d.tar.bz2 |
Merge (with adjustment) from 1.1.
--HG--
rename : src/libfaad/Makefile.am => contrib/libfaad/Makefile.am
rename : include/xine.h.in => include/xine.h
rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am
rename : src/libmpeg2/Makefile.am => src/video_dec/libmpeg2/Makefile.am
Diffstat (limited to 'm4')
0 files changed, 0 insertions, 0 deletions