Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=3c7cd121096c0266d2e506f8ec107d7d757e61b9

commit 3c7cd121096c0266d2e506f8ec107d7d757e61b9
Merge: 037ad35 40b2a10
Author: James Buren <[email protected]>
Date:   Mon Oct 29 03:03:56 2012 -0500

Merge branch 'master' of ../current

Conflicts:
source/e17-extra/emotion/FrugalBuild

diff --cc source/e17-extra/emotion/FrugalBuild
index 564240a,3d17834..70c7322
--- a/source/e17-extra/emotion/FrugalBuild
+++ b/source/e17-extra/emotion/FrugalBuild
@@@ -2,11 -2,10 +2,10 @@@
# Maintainer: jercel <[email protected]>

pkgname=emotion
- pkgver=1.7.0
- pkgrel=4
+ pkgver=1.7.1
+ pkgrel=1
pkgdesc="Video playback library for E17"
- depends=('edje>=1.7.0' 'xine-lib>=1.2.2-1' 'gstreamer')
- makedepends=('subversion')
-depends=('edje>=1.7.1' 'xine-lib>=1.2.2' 'gstreamer')
++depends=('edje>=1.7.1' 'xine-lib>=1.2.2-1' 'gstreamer')
groups=('e17-extra' 'e17-core')
archs=('i686' 'x86_64')
Finclude e17
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to