summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-08-18 01:05:59 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-08-18 01:05:59 -0300
commitdf6dfbf4e5ec7073afef3a4b5c3f3c4e88aba010 (patch)
tree8bc0278e6c151582369a136fa9921aeb9fd72d03
parentb10135b1a14de89a8c8babaa4b8963306822002c (diff)
parent77e0d7c07802d26e92aed4cafb1b2959fed93555 (diff)
downloadmediapointer-dvb-s2-df6dfbf4e5ec7073afef3a4b5c3f3c4e88aba010.tar.gz
mediapointer-dvb-s2-df6dfbf4e5ec7073afef3a4b5c3f3c4e88aba010.tar.bz2
merge: http://linuxtv.org/hg/~rmcc/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--.hgignore11
1 files changed, 6 insertions, 5 deletions
diff --git a/.hgignore b/.hgignore
index 28fc54348..fef31c1bf 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,3 +1,6 @@
+.*[.]rej
+.*[.]orig
+.*[~]
v4l/.version
v4l/.tmp_versions/.*
v4l/[^/]*[.]c
@@ -9,16 +12,14 @@ v4l/Kconfig
v4l/Kconfig.kern
v4l/Makefile.media
v4l/ivtv
-.*[.]rej
-.*[.]orig
-.*[~]
-.myconfig
v4l/Modules.symvers
v4l/scripts/Kconfig
v4l/scripts/Kconfig.kern
v4l/config-compat.h
+v4l/.myconfig
test/ioctl-test
test/sliced-vbi-detect
test/sliced-vbi-test
test/vbi-test
-
+.pc
+patches/