Merge conflict in package file resolved
Description
Description
Details
Details
- Committed
Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch> Aug 11 2015, 11:28 - Pushed
richart Dec 6 2019, 13:35 richart Dec 6 2019, 13:16 richart Dec 6 2019, 12:16 richart Dec 6 2019, 11:45 richart Dec 5 2019, 22:54 richart Dec 5 2019, 18:45 - Parents
- rAKA1b6b4ed6ebf4: INTEREST_LIST generated in cmake (ticket #68)
rAKAbb55a5f6cf65: package modifications for compatibilty with changes in cmake of Akantu - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 1b6b4ed6ebf4 | richart | INTEREST_LIST generated in cmake (ticket #68) | Aug 8 2015 | |||
| 023f962f6e6b | richart | Modified cmake to declare the element info in the packages | Jul 19 2015 | |||
| 5eb4dddc55a1 | richart | Merge commit '2a1d6ff901a8c8444186312765ecfba230e5b6d3' | Jul 18 2015 | |||
| f97926fb517c | richart | Extracted the generation of the material lists to the cmake packages | Jul 18 2015 | |||
| 2a1d6ff901a8 | Clement Roux | New test with another critical configuration | Jul 17 2015 |