[Frugalware-git] wipv: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

[Miklos Vajna]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=064e9323f1a91fc52dbe824fe07ea37a78e2f93d

commit 064e9323f1a91fc52dbe824fe07ea37a78e2f93d
Merge: 6f1ebf1 46f1d4f
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Fri Sep 3 12:58:51 2010 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

* 'master' of git.frugalware.org:/pub/frugalware/frugalware-current: (23 commits)

Conflicts:
source/lib/libproxy/FrugalBuild

diff --cc source/lib/libproxy/FrugalBuild
index 266de60,c8c4770..4f4cec4
--- a/source/lib/libproxy/FrugalBuild
+++ b/source/lib/libproxy/FrugalBuild
@@@ -2,8 -2,8 +2,8 @@@
# Maintainer: bouleetbil <bouleetbil at frogdev.info>

pkgname=libproxy
- pkgver=0.4.5
+ pkgver=0.4.6
-pkgrel=1
+pkgrel=2
pkgdesc="libproxy is a library that provides automatic proxy configuration management."
depends=('glibc' 'dbus')
makedepends=('automoc4')