diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-13 18:29:48 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-13 18:29:48 -0200 |
commit | 20a16b5ff3c186e90241702dbbc00a25d0b1b9e2 (patch) | |
tree | 9cf76edcb9951186fccb7d89db0cb45a1bb637b1 /hgimport | |
parent | 27bdf53f81e7783e79bcd334e4d3d5d329708694 (diff) | |
parent | 646f5e295e95d6295503fd5b3f5105102c8cc687 (diff) | |
download | mediapointer-dvb-s2-20a16b5ff3c186e90241702dbbc00a25d0b1b9e2.tar.gz mediapointer-dvb-s2-20a16b5ff3c186e90241702dbbc00a25d0b1b9e2.tar.bz2 |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-lib
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'hgimport')
-rwxr-xr-x | hgimport | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -104,3 +104,6 @@ done echo To cherry pick all files, you can do something like: echo "for i in $TMP/*.patch; do ./mailimport \$i; done" +echo "To merge it, the better is to do:" +echo "hg pull $1; hg merge && hg commit && make && hg push" + |