aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher (jlec) <jlec@j-schmitz.net>2009-08-15 00:23:01 +0200
committerJustin Lecher (jlec) <jlec@j-schmitz.net>2009-08-15 00:23:01 +0200
commit0c78925a9468bfd28b591178adcfc022349a5e0f (patch)
treecf7ea9f57c78d54c86c2750d3b7abf6143a3b574 /sci-chemistry/ccp4-apps
parentccp4i -- fixes to remove imosflm (diff)
downloadsci-0c78925a9468bfd28b591178adcfc022349a5e0f.tar.gz
sci-0c78925a9468bfd28b591178adcfc022349a5e0f.tar.bz2
sci-0c78925a9468bfd28b591178adcfc022349a5e0f.zip
ccp4-apps Manifest renewel due to merge
Diffstat (limited to 'sci-chemistry/ccp4-apps')
-rw-r--r--sci-chemistry/ccp4-apps/Manifest7
1 files changed, 2 insertions, 5 deletions
diff --git a/sci-chemistry/ccp4-apps/Manifest b/sci-chemistry/ccp4-apps/Manifest
index 0ae744f46..0b0b8cee2 100644
--- a/sci-chemistry/ccp4-apps/Manifest
+++ b/sci-chemistry/ccp4-apps/Manifest
@@ -11,9 +11,6 @@ AUX 6.1.2-gcc4.4.patch 1006 RMD160 5d66b599da41649b836080f18dcea292917c88eb SHA1
AUX 6.1.2-rename-rapper.patch 2856 RMD160 37504bed3cb4e1858d88331305deef6564616b02 SHA1 31f513c987e1408b868f8c9de4aaa9f2c35cb378 SHA256 d9fed1ec65089c4130358aeed771b32c1253e48a73e90f0ce7b92bd0abbb0c2b
AUX 6.1.2-rename-truncate.patch 1515 RMD160 eff332faa67a1732e0f99cc6cdcb846932eadc87 SHA1 b504542cf710e1b54a684b0fa0e8d73d967c96ac SHA256 50a59a1856867daa3de1f8f53e92bcfe74dea3a6d3c4ba238a9ea83dbcdfbf07
DIST ccp4-6.1.2-core-src.tar.gz 247203188 RMD160 19019c6cd37e83cf6d2d19f91979edc978d18395 SHA1 2423178d3877dd44d3671a7eb4d6666de6852cb7 SHA256 bcae870675270be410278d9a6f2ee19f9caf32b73fd969e9381a4d510f174c75
-<<<<<<< HEAD:sci-chemistry/ccp4-apps/Manifest
-=======
-EBUILD ccp4-apps-6.1.2-r1.ebuild 10881 RMD160 4b5c4cbd8577f09a12b6b4f1d42eb066a8ad62bc SHA1 1acb99d05232a37594f0372cae835af2ce8dbad2 SHA256 e2b2789ba7f5109657888fc46d7b9825bcedddcf71256ba8acd4621c7975832a
-MISC ChangeLog 6117 RMD160 0eaaa268dfbc2ae87194c396d78d3df6c6d69c4b SHA1 adc84e1a64b07a3f69a1f0fa9f8f45aa58830f50 SHA256 a178de4a9ccce3f3ff5ef00717f4815316dee418226c591b8cb7c87e0c6ec193
+EBUILD ccp4-apps-6.1.2-r1.ebuild 10861 RMD160 d18c4fdc68cfd90669b4939272e58f6bbad6e93d SHA1 dc49b9c8b447449db181fa146b6b8035510328cb SHA256 c4206df250311867ddae65bf9bca771b3fa78776b00b7531be3cffe2ce53306b
+MISC ChangeLog 6254 RMD160 ddbe5a27e217bfef1e797a36198898400d4fd4b2 SHA1 263cac2840ab8a1dd142a1cde744e3460f1ee63a SHA256 b8b54fb01333be6ac2dd1f8b135258e01f63589edc8be4bb89d3f9ce63e7e0af
MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
->>>>>>> ccp4 setup.sh part 2:sci-chemistry/ccp4-apps/Manifest