wok diff xorg-xf86-video-v4l/receipt @ rev 16924

thermald: "hg resolve --all; hg resolve --mark; hg merge" and company...
author: Aleksej Bobylev <al.bobylev@gmail.com>
date: Thu Jul 17 21:20:25 2014 +0300 (2014-07-17)
parents: 6971e86f8875
children: bdf615a85cda
     1.1 --- a/xorg-xf86-video-v4l/receipt	Wed Apr 25 10:44:52 2012 +0200
     1.2 +++ b/xorg-xf86-video-v4l/receipt	Thu Jul 17 21:20:25 2014 +0300
     1.3 @@ -4,6 +4,7 @@
     1.4  VERSION="0.2.0"
     1.5  CATEGORY="x-window"
     1.6  MAINTAINER="devel@slitaz.org"
     1.7 +LICENSE="MIT"
     1.8  SHORT_DESC="X.org v4l video driver"
     1.9  WEB_SITE="http://xorg.freedesktop.org/"
    1.10  SOURCE="xf86-video-v4l"
author	Aleksej Bobylev <al.bobylev@gmail.com>
date	Thu Jul 17 21:20:25 2014 +0300 (2014-07-17)
parents	6971e86f8875
children	bdf615a85cda