From 10018f4a0c47aa57a8e867d82d302fc70b1a24c3 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Mon, 7 Oct 2024 15:32:42 +0200 Subject: [PATCH] Add a cherry pick for madgraph5amc --- .cherry-pick | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.cherry-pick b/.cherry-pick index 747a6eca..441f9db3 100644 --- a/.cherry-pick +++ b/.cherry-pick @@ -60,6 +60,10 @@ git cherry-pick bb9bbeecad68dcc1e14211fa7940d26df663aaea -X theirs --no-commit # py-lxml: add version 5.3.0, remove when https://github.com/spack/spack/pull/46771 is merged git cherry-pick bbb97dfb9b976e588ad63b19cd401788c9d6e5bc -X theirs --no-commit +# madgraph5amc: add v3.5.6, remove when https://github.com/spack/spack/pull/46844 is merged +git cherry-pick 5777576e37ee28d674e2520d3f10b3f651a7680e -X theirs --no-commit + + # Versions for the release, in order DD4hep and podio&edm4hep and LCIO git cherry-pick 43d1cdb0bd4780bff369dafa681a8a7939313784 -X theirs --no-commit git cherry-pick 5d9c534018593fdef5db1028c60026d26bf4d65b -X theirs --no-commit