aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-06-25 19:21:37 +0200
committerJustin Lecher <jlec@gentoo.org>2011-06-25 19:21:37 +0200
commit572dfa781d2285ae54208b33fd1447c16ea27173 (patch)
treebc4b00fd6bf383f3d640fdd111a8aae7d0553abd /app-doc/gromacs-manual/ChangeLog
parentCleaned ebuild (diff)
parent[sys-cluster/nullmpi] migrate to git-2 (diff)
downloadsci-572dfa781d2285ae54208b33fd1447c16ea27173.tar.gz
sci-572dfa781d2285ae54208b33fd1447c16ea27173.tar.bz2
sci-572dfa781d2285ae54208b33fd1447c16ea27173.zip
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci
* 'master' of git+ssh://git.overlays.gentoo.org/proj/sci: [sys-cluster/nullmpi] migrate to git-2 [sci-chemistry/gromacs] migrate to git-2 [sci-physics/espresso] migrate to git-2 [app-doc/gromacs-manual] migrate to git-2 Conflicts: app-doc/gromacs-manual/ChangeLog app-doc/gromacs-manual/Manifest app-doc/gromacs-manual/gromacs-manual-9999.ebuild sci-chemistry/gromacs/ChangeLog sci-chemistry/gromacs/Manifest sci-physics/espresso/ChangeLog sci-physics/espresso/Manifest sys-cluster/nullmpi/ChangeLog sys-cluster/nullmpi/Manifest sys-cluster/nullmpi/nullmpi-9999.ebuild Signed-off-by: Justin Lecher <jlec@gentoo.org>
Diffstat (limited to 'app-doc/gromacs-manual/ChangeLog')
-rw-r--r--app-doc/gromacs-manual/ChangeLog12
1 files changed, 9 insertions, 3 deletions
diff --git a/app-doc/gromacs-manual/ChangeLog b/app-doc/gromacs-manual/ChangeLog
index 35e0018b7..b9f148f17 100644
--- a/app-doc/gromacs-manual/ChangeLog
+++ b/app-doc/gromacs-manual/ChangeLog
@@ -2,9 +2,15 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
- 25 Jun 2011; Justin Lecher <jlec@gentoo.org> gromacs-manual-9999.ebuild,
- metadata.xml:
- migrate from 'git' to 'git-2'
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> gromacs-manual-9999.ebuild:
+ Merged
+
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> gromacs-manual-9999.ebuild:
+ Merged
+
+ 25 Jun 2011; Christoph Junghans <ottxor@gentoo.org>
+ gromacs-manual-9999.ebuild:
+ migrate to git-2
*gromacs-manual-9999 (26 Aug 2010)