Merge branch 'master' into fftw_plans
Description
Description
Details
Details
- Committed
frerot Apr 29 2016, 11:47 - Pushed
anciaux Sep 11 2017, 16:30 - Parents
- rTAMAAS8c18a80baa99: fixed for cluster compilation
rTAMAAS4142cccbc754: fixing conflicts - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 4142cccbc754 | Valentine | fixing conflicts | Apr 28 2016 | |||
| d7b69858f20f | Valentine | uzawa algorithm for contact | Apr 28 2016 | |||
| 4ec4af246359 | anciaux | remove coucou | Apr 28 2016 | |||
| 33c5686e39b2 | anciaux | remove gigi's warnings | Apr 21 2016 | |||
| bec2ad78b980 | Valentine | Merge branch 'master' of lsmssrv1.epfl.ch:tamaas | Apr 21 2016 | |||
| c778868966ac | Valentine | commit penalty method | Apr 21 2016 | |||
| 63c97dc24742 | anciaux | correction of the copy operator | Apr 21 2016 | |||
| 59cd5f6f93cf | frerot | removed file in src/SConscript from other branch | Apr 18 2016 | |||
| 815561917bf1 | frerot | fixed for cluster compilation | Apr 18 2016 | |||
| ed9b22603b4f | frerot | cleaner scons config | Apr 18 2016 |