diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2009-02-14 11:12:43 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2009-02-14 11:12:43 +0100 |
| commit | f957f39eafc6f6d168d3ae4f61f7a15a29cee6c8 (patch) | |
| tree | 19db0887def3bf12dd92679fc773ba53fc100be6 /.hgignore | |
| parent | d0ee609e50f6eba78db4783e1374311be2e38ea5 (diff) | |
| parent | adff0f37dc0f0ab48850eaad267223c634e975a2 (diff) | |
| download | mediapointer-dvb-s2-f957f39eafc6f6d168d3ae4f61f7a15a29cee6c8.tar.gz mediapointer-dvb-s2-f957f39eafc6f6d168d3ae4f61f7a15a29cee6c8.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to '.hgignore')
| -rw-r--r-- | .hgignore | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -27,7 +27,7 @@ v4l/modules.order$ v4l/config-compat.h$ v4l/.myconfig$ v4l/.snapshot$ -v4l2-apps/lib/.*\.so$ +v4l2-apps/libv4l2util/.*\.so$ v4l2-apps/include v4l2-apps/test/driver-test$ v4l2-apps/test/v4lgrab$ @@ -35,11 +35,13 @@ v4l2-apps/test/ioctl-test$ v4l2-apps/test/sliced-vbi-detect$ v4l2-apps/test/sliced-vbi-test$ v4l2-apps/test/vbi-test$ -v4l2-apps/test/capture_example$ +v4l2-apps/test/capture-example$ v4l2-apps/test/pixfmt-test$ +v4l2-apps/test/stress-buffer$ v4l2-apps/util/v4l2-dbg$ v4l2-apps/util/v4l2-chipids.cpp$ v4l2-apps/util/v4l2-compliance$ +v4l2-apps/util/v4l2-sysfs-path$ v4l2-apps/util/keycodes/.* v4l2-apps/util/keytable$ v4l2-apps/util/parse.h$ @@ -52,8 +54,10 @@ v4l2-apps/util/v4l2-ctl$ v4l2-apps/util/cx18-ctl$ v4l2-apps/util/ivtv-ctl$ v4l2-apps/util/v4l-board-dbg$ -v4l2-apps/lib/libv4l/libv4l[12]/.*.so.0$ -v4l2-apps/lib/libv4l/libv4lconvert/.*.so.0$ +v4l2-apps/libv4l/libv4l[12]/.*.so.0$ +v4l2-apps/libv4l/libv4lconvert/.*.so.0$ +v4l2-apps/libv4l/libv4l[12]/.*.so$ +v4l2-apps/libv4l/libv4lconvert/.*.so$ v4l2-spec/capture$ v4l2-spec/capture.c.sgml$ v4l2-spec/entities.sgml$ |