aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-libs/bigdft/ChangeLog')
-rw-r--r--sci-libs/bigdft/ChangeLog9
1 files changed, 6 insertions, 3 deletions
diff --git a/sci-libs/bigdft/ChangeLog b/sci-libs/bigdft/ChangeLog
index 224a6f374..812748003 100644
--- a/sci-libs/bigdft/ChangeLog
+++ b/sci-libs/bigdft/ChangeLog
@@ -2,7 +2,11 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
-<<<<<<< HEAD
+ 03 Mar 2013; Justin Lecher <jlec@gentoo.org> bigdft-1.7_pre12.ebuild:
+ Fix issue 52
+
+ 03 Mar 2013; Justin Lecher <jlec@gentoo.org> bigdft-1.7_pre12.ebuild:
+ Fix issue 52
22 Feb 2013; Justin Lecher <jlec@gentoo.org> -bigdft-1.6_pre1-r4.ebuild,
bigdft-1.6.0-r2.ebuild, bigdft-1.7_pre12.ebuild, metadata.xml:
@@ -50,11 +54,10 @@
+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)