aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHonza Macháček <Hloupy.Honza@centrum.cz>2012-07-04 15:06:03 +0200
committerHonza Macháček <Hloupy.Honza@centrum.cz>2012-07-04 15:06:03 +0200
commit809ad823772cbcfbd5acc177715653668afcfd70 (patch)
tree91b8e9afb211ebccec79feb4f13a456da32e45f8 /sci-libs/bigdft/ChangeLog
parentsci-libs/bigdft-1.6_pre1 from -r2 to -r3: patched to install necessary librar... (diff)
parentdev-util/nvidia-cuda-toolkit: This package is prebuilt so we are using QA_PRE... (diff)
downloadsci-809ad823772cbcfbd5acc177715653668afcfd70.tar.gz
sci-809ad823772cbcfbd5acc177715653668afcfd70.tar.bz2
sci-809ad823772cbcfbd5acc177715653668afcfd70.zip
a blind attempt to get from a pull-push confusion
Diffstat (limited to 'sci-libs/bigdft/ChangeLog')
-rw-r--r--sci-libs/bigdft/ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/sci-libs/bigdft/ChangeLog b/sci-libs/bigdft/ChangeLog
index b0e101e47..7a43f6b50 100644
--- a/sci-libs/bigdft/ChangeLog
+++ b/sci-libs/bigdft/ChangeLog
@@ -2,6 +2,7 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+<<<<<<< HEAD
*bigdft-1.6_pre1-r3 (04 Jul 2012)
04 Jul 2012; Honza Macháček <Hloupy.Honza@centrum.cz>
@@ -10,6 +11,11 @@
+files/bigdft-1.6-tuto.1-gcc-4.6.patch:
bigdft-1.6_pre1 from -r2 to -r3: patched to install necessary libraries for
GPU support and to compile with gcc-4.6
+=======
+ 22 Jun 2012; Alexey Shvetsov <alexxy@gentoo.org> bigdft-1.6.0-r2.ebuild,
+ bigdft-1.6_pre1-r2.ebuild:
+ [sci-libs/bigdft] add ~amd64-linux
+>>>>>>> cd00b2db98a3e0ec9013e1d3646e292213071270
*bigdft-1.6.0-r2 (19 Jun 2012)
*bigdft-1.6_pre1-r2 (19 Jun 2012)