wok diff wine-dev/receipt @ rev 16434

Merge branches
author: Aleksej Bobylev <al.bobylev@gmail.com>
date: Fri Apr 18 13:51:05 2014 +0300 (2014-04-18)
parents: 2a21689b0af7
children: c42b4a58182a
     1.1 --- a/wine-dev/receipt	Thu Oct 03 09:52:57 2013 +0000
     1.2 +++ b/wine-dev/receipt	Fri Apr 18 13:51:05 2014 +0300
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="wine-dev"
     1.7 -VERSION="1.5.23"
     1.8 +VERSION="1.7.16"
     1.9  CATEGORY="system-tools"
    1.10  SHORT_DESC="Windows API for Linux development files."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
author	Aleksej Bobylev <al.bobylev@gmail.com>
date	Fri Apr 18 13:51:05 2014 +0300 (2014-04-18)
parents	2a21689b0af7
children	c42b4a58182a