summaryrefslogtreecommitdiff
path: root/libre/luxrays-libre/PKGBUILD
diff options
context:
space:
mode:
authorMárcio Alexandre Silva Delgado <coadde@adinet.com.uy>2012-08-01 21:36:53 -0300
committerMárcio Alexandre Silva Delgado <coadde@adinet.com.uy>2012-08-01 21:36:53 -0300
commit7e00045a605d554cdf361c2794b8b600ed940fdb (patch)
tree539341434b5684275e1a90b6939721ff74312ed1 /libre/luxrays-libre/PKGBUILD
parent283ba6b5f63103403e4b908aa5c3d1b12eb6a689 (diff)
parent62a0b15275fa1f33b1f1108e3908d1875c139a77 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Conflicts: libre/luxrays-libre/PKGBUILD
Diffstat (limited to 'libre/luxrays-libre/PKGBUILD')
-rw-r--r--libre/luxrays-libre/PKGBUILD6
1 files changed, 6 insertions, 0 deletions
diff --git a/libre/luxrays-libre/PKGBUILD b/libre/luxrays-libre/PKGBUILD
index 279e6622e..54cc019c9 100644
--- a/libre/luxrays-libre/PKGBUILD
+++ b/libre/luxrays-libre/PKGBUILD
@@ -3,9 +3,15 @@
# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
_pkgname=luxrays
pkgname=luxrays-libre
+<<<<<<< HEAD
pkgver=1.0rc3
_pkgver=eb749c000ffc
pkgrel=1
+=======
+pkgver=1.0rc2
+_pkgver=8707be9e6dc9
+pkgrel=2
+>>>>>>> 49036a91fc7b4725702d34335419075ec4aff4f3
epoch=0
pkgdesc="Accelerate the ray intersection process by using CPUs (without OpenCL)"
arch=('i686' 'x86_64' 'mips64el')