Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=352c3c96a29a33bbf646e32c9715b8f9d909b98b
commit 352c3c96a29a33bbf646e32c9715b8f9d909b98b Merge: 455c1f8 cd4ab5b Author: bouleetbil <[email protected]> Date: Tue Mar 22 14:48:33 2011 +0100 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/devel/php/FrugalBuild diff --cc source/devel/php/FrugalBuild index b632614,806e565..205445c --- a/source/devel/php/FrugalBuild +++ b/source/devel/php/FrugalBuild @@@ -3,8 -4,8 +4,8 @@@ # Contributor: VMiklos <[email protected]> pkgname=php - pkgver=5.3.5 + pkgver=5.3.6 -pkgrel=1 +pkgrel=2 pkgdesc="A widely-used general-purpose scripting language" url="http://www.php.net"; backup=(etc/{php.ini,httpd/conf/modules.d/$pkgname.conf}) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
