[arch-commits] Commit in nitrogen/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Belanger]

    Date: Saturday, May 24, 2008 @ 16:48:00
  Author: eric
Revision: 2085

fixed svn conflict

Modified:
  nitrogen/repos/extra-x86_64/	(properties)
  nitrogen/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)


Property changes on: nitrogen/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /nitrogen/trunk:1
   + /nitrogen/trunk:1-2084

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-05-24 20:45:26 UTC (rev 2084)
+++ extra-x86_64/PKGBUILD	2008-05-24 20:48:00 UTC (rev 2085)
@@ -2,10 +2,10 @@
 # Maintainer: James Rayner <james at archlinux.org>
 # Contributor: Sebastian Sareyko <public at nooms.de>
 pkgname=nitrogen
-pkgver=1.2
+pkgver=1.3
 # author has habit of using -rc and things for version. left here for future use.
-_pkgver=1.2
-pkgrel=2.1
+_pkgver=1.3
+pkgrel=1
 pkgdesc="A background browser and setter for X windows"
 arch=('i686' 'x86_64')
 url="http://l3ib.org/nitrogen/"
@@ -26,5 +26,4 @@
 
 
 
-
-md5sums=('a0c08236aa1683e020d607a42f3233fc')
+md5sums=('1f2b0b40ac286d0b185b23f234b237dd')