solving merge issues from changed files from TA's
Description
Description
Details
Details
- Committed
barjavel Nov 26 2018, 14:45 - Pushed
barjavel Nov 27 2018, 09:22 - Parents
- R7571:d2e62d0bd006: fixed starting point to pass tests and ignore gtest if not found
R7571:fff51da09eb3: Compute contact changed and trajectories evaluated in paraview - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| d2e62d0bd006 | frerot | fixed starting point to pass tests and ignore gtest if not found | Nov 21 2018 | |||
| 800b6c2bd170 | frerot | better gitignore | Nov 20 2018 | |||
| c10f97c9629d | frerot | Merge branch 'master' of ssh://c4science.ch/source/sp4e | Nov 20 2018 | |||
| abc6a7d54d35 | frerot | cleaning starting point for week 10 | Nov 20 2018 | |||
| 7b90fc28205e | anciaux | update the homework schedule | Nov 20 2018 |
