aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sci-libs/minuit/ChangeLog4
-rw-r--r--sci-libs/minuit/Manifest2
2 files changed, 1 insertions, 5 deletions
diff --git a/sci-libs/minuit/ChangeLog b/sci-libs/minuit/ChangeLog
index 5915b05d5..797925f9d 100644
--- a/sci-libs/minuit/ChangeLog
+++ b/sci-libs/minuit/ChangeLog
@@ -2,11 +2,7 @@
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
-<<<<<<< .mine
-*minuit-1.7.6 (28 Nov 2005)
-=======
*minuit-1.7.9 (10 Jan 2006)
->>>>>>> .r50
10 Jan 2006; Sebastien Fabbro <seb@ist.utl.pt>
+minuit-1.7.9.ebuild, +ChangeLog, +metadata.xml
diff --git a/sci-libs/minuit/Manifest b/sci-libs/minuit/Manifest
index 8f703a5c2..90c79c4c3 100644
--- a/sci-libs/minuit/Manifest
+++ b/sci-libs/minuit/Manifest
@@ -1,4 +1,4 @@
-MD5 ffa8967f882003a79dc5a6dba1cbc16a ChangeLog 343
+MD5 d05504c37d8d12213fbcfb9a2e59db95 ChangeLog 280
MD5 e0bbe41ea442abe4abf05421c0302674 files/digest-minuit-1.7.9 125
MD5 50df470a6b0cebe69592d36118f247b0 metadata.xml 454
MD5 7048a40092028941afac2daa325b1ada minuit-1.7.9.ebuild 981