Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=7a2f02c8e7c5e792214dc4ee02f75fa02cc17c23
commit 7a2f02c8e7c5e792214dc4ee02f75fa02cc17c23 Merge: c9ddc17 30ddf68 Author: Miklos Vajna <[email protected]> Date: Sat Apr 23 13:15:26 2011 +0200 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/kde/kdepim-runtime/FrugalBuild source/kde/kdepim/FrugalBuild diff --cc source/kde/kdepim-runtime/FrugalBuild index 66b00b9,dbe514a..06cf36a --- a/source/kde/kdepim-runtime/FrugalBuild +++ b/source/kde/kdepim-runtime/FrugalBuild @@@ -2,8 -2,8 +2,8 @@@ # Maintainer: DeX77 <[email protected]> pkgname=kdepim-runtime - pkgver=4.4.10 + pkgver=4.4.11.1 -pkgrel=1 +pkgrel=2 pkgdesc="KDE PIM Runtime" groups=('kde') archs=('i686' 'x86_64') diff --cc source/kde/kdepim/FrugalBuild index 023dc89,c136f5d..55cd3d0 --- a/source/kde/kdepim/FrugalBuild +++ b/source/kde/kdepim/FrugalBuild @@@ -2,8 -2,8 +2,8 @@@ # Maintainer: DeX77 <[email protected]> pkgname=kdepim - pkgver=4.4.10 + pkgver=4.4.11.1 -pkgrel=1 +pkgrel=2 pkgdesc="KDE PIM Utilities." groups=('kde') replaces=('klibido' 'taskjuggler') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
