Merge branch 'master' of ssh://c4science.ch/diffusion/1695/numerical-integration
- Conflicts:
- CMakeLists.txt
- bin/NumInt
- bin/int_err.dat
- main.cpp
Description
Description
Details
Details
- Committed
ollitrault Nov 30 2016, 12:27 - Pushed
ollitrault Nov 30 2016, 12:27 - Parents
- R1695:fe35bf0b1910: commit untracked files
R1695:8e56c40242fe: Adding one dim integration (trapz and simpson) - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 8e56c40242fe | rouaze | Adding one dim integration (trapz and simpson) | Nov 29 2016 | |||
| 54e50b2774b1 | rouaze | Merge remote-tracking branch 'origin/master' | Nov 29 2016 | |||
| 74b8722fc338 | rouaze | Files update | Nov 29 2016 |