summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2009-01-18 16:36:31 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2009-01-18 16:36:31 +0000
commitc62b455944c8c91bd4d9ae5e8000ec33190174c5 (patch)
tree3578282592cd5a84e330fd4c41a3c6afa7d50d17 /.hgignore
parentd797ae8a0d0e011515b37e76cbc0c0b869714ea3 (diff)
parentf4b5e62eb102b684ea206112d09cfcbc05e1e91e (diff)
downloadxine-lib-c62b455944c8c91bd4d9ae5e8000ec33190174c5.tar.gz
xine-lib-c62b455944c8c91bd4d9ae5e8000ec33190174c5.tar.bz2
Merge from 1.1.
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore8
1 files changed, 8 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 66cdc714c..70df67ac3 100644
--- a/.hgignore
+++ b/.hgignore
@@ -102,6 +102,7 @@ m4/ltsugar.m4
m4/ltversion.m4
m4/lt~obsolete.m4
+misc/Makefile.plugins
misc/SlackBuild
misc/build_rpms.sh
misc/libxine.pc
@@ -119,4 +120,11 @@ po/stamp-po
po/insert-header.sed
po/remove-potcdate.sed
+src/combined/ffmpeg/avcodec_*.list
+src/combined/ffmpeg/ff_*_list.h
+src/libffmpeg/ffmpeg_config.h
+src/video_out/libdha/pci_dev_ids.c
+src/video_out/libdha/pci_ids.h
+src/video_out/libdha/pci_names.[ch]
+src/video_out/libdha/pci_vendors.h
src/xine-utils/xmltest