summaryrefslogtreecommitdiff
path: root/misc/Makefile.am
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2010-03-24 21:02:08 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2010-03-24 21:02:08 +0000
commit1e26328be7611a7acdd5f9ecbcac32cba5cfab57 (patch)
tree74fb64a947e066d05874954404414997f5ae7641 /misc/Makefile.am
parentbf90f534f29892ded8f92f088bd9c78486d5833e (diff)
parent74853b910cfd296eb0fea43394a3819e803c46b9 (diff)
downloadxine-lib-1e26328be7611a7acdd5f9ecbcac32cba5cfab57.tar.gz
xine-lib-1e26328be7611a7acdd5f9ecbcac32cba5cfab57.tar.bz2
Merge from 1.1.
--HG-- rename : doc/hackersguide/internals.sgml => doc/hackersguide/internals.docbook rename : doc/hackersguide/library.sgml => doc/hackersguide/library.docbook rename : include/xine.h.in => include/xine.h rename : src/xine-engine/buffer.h => include/xine/buffer.h rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
Diffstat (limited to 'misc/Makefile.am')
-rw-r--r--misc/Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/misc/Makefile.am b/misc/Makefile.am
index f5f5b2ef9..308ac6533 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -8,6 +8,7 @@ EXTRA_DIST = build_rpms.sh \
xine-lib.spec.in \
xine-lib.spec \
libxine.pc.in \
+ logo/xine_logo_text.svg \
libdvdcss-1.2.6-network.patch \
Makefile.plugins.in \
Makefile.common \