fixed merge conflicts.
Description
Description
Details
Details
- Committed
tlemaire Oct 16 2018, 10:26 - Pushed
tlemaire Oct 16 2018, 10:26 - Parents
- R7571:82ddc20a545f: adding snippet for classes in python
R7571:896cd9d1509d: updated README file - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 82ddc20a545f | anciaux | adding snippet for classes in python | Oct 16 2018 | |||
| 8865b41ae6b2 | anciaux | adding snippet for classes in python | Oct 16 2018 | |||
| 9b57b6363c4e | anciaux | adding the lecture of the day | Oct 16 2018 | |||
| b29e32e9860c | anciaux | Merge branch 'master' of ssh://c4science.ch/source/sp4e | Oct 9 2018 | |||
| 8dd209c6a9b3 | anciaux | update lecture for numpy's shapes | Oct 9 2018 | |||
| 95e9714a8b47 | pundir | data.plot added | Oct 9 2018 | |||
| b3296fda9a0c | anciaux | cleaning | Oct 9 2018 | |||
| 9a349c752857 | pundir | week 4 homework added | Oct 9 2018 | |||
| e8608da116a2 | pundir | Merge branch 'master' of ssh://c4science.ch/source/sp4e | Oct 9 2018 | |||
| 6540ff8071bc | pundir | week 4 matplotlib exercise added | Oct 9 2018 | |||
| bc66a22fe46b | anciaux | Merge branch 'master' of ssh://c4science.ch/source/sp4e | Oct 9 2018 | |||
| 67640a209c32 | anciaux | adding the lecture of the day | Oct 9 2018 | |||
| 921b99ed7da3 | pundir | solution for week 3 added | Oct 9 2018 | |||
| 89fb9918a8df | anciaux | update the exercise | Oct 2 2018 | |||
| f0b7444c8cb9 | anciaux | modify the map examples | Oct 2 2018 | |||
| 7ad3abe9c45b | anciaux | Merge branch 'master' of ssh://c4science.ch/source/sp4e | Oct 2 2018 | |||
| 8bd08544b4c2 | anciaux | adding the map example | Oct 2 2018 | |||
| 1b7ce0eb68c6 | pundir | week 3 execise added | Oct 2 2018 | |||
| 5b280104ad70 | anciaux | again a little change in the slides | Oct 2 2018 | |||
| 2ae3271e0236 | anciaux | update the fstream | Oct 2 2018 | |||
| b1b8e76ca4d5 | anciaux | small change in lecture | Oct 2 2018 | |||
| 29ac39dd6d9b | anciaux | lecture of the day ready | Oct 2 2018 | |||
| d8307ad9043c | anciaux | lecture ready for tomorrow | Oct 2 2018 | |||
| f14086f6f311 | anciaux | Merge branch 'master' of ssh://c4science.ch/source/sp4e | Oct 1 2018 | |||
| ccbc4f363482 | anciaux | adding lecture for tomorrow | Oct 1 2018 | |||
| 97153403a79f | anciaux | adding files generated by Clion | Oct 1 2018 | |||
| 449ef89e0102 | anciaux | adding the CMakeLists.txt | Oct 1 2018 | |||
| ab94a8c98f49 | anciaux | adding the snippets | Oct 1 2018 | |||
| 146b656d81c0 | pundir | solution for week 2 added | Sep 27 2018 | |||
| 3d3a02a8670e | pundir | debug modification in hello/sujet | Sep 25 2018 | |||
| dd0da9a1246c | pundir | removed MakeFile instruction from hello sujet | Sep 25 2018 | |||
| e83a50f25c84 | pundir | week 2 exercise on float added | Sep 25 2018 | |||
| 6d553f359423 | pundir | week 2 exercises hello & pi added | Sep 25 2018 | |||
| f13465eaa504 | anciaux | small modif | Sep 25 2018 | |||
| 477ae1d9edfd | anciaux | adding the code snippet | Sep 25 2018 | |||
| 20f2b5f30970 | anciaux | adding the lecture of the day | Sep 25 2018 | |||
| c843a9d77190 | anciaux | modify gitignore | Sep 24 2018 | |||
| 52f7f7d20123 | anciaux | modify gitignore | Sep 24 2018 | |||
| 5520bc5638c0 | anciaux | small correction for python3 | Sep 20 2018 | |||
| 91d82afa3439 | anciaux | make the solution pep8 and python3 | Sep 20 2018 | |||
| 86e11a824797 | anciaux | adding the solution for exercise of week1 | Sep 20 2018 | |||
| c8732af7a3d0 | anciaux | list of packages installed on the VirtualBox | Sep 18 2018 | |||
| bdff9e3a8ce4 | anciaux | make print python3 in pdb exo | Sep 18 2018 | |||
| 4873adec466b | pundir | changed python3-spyder to spyder3 in python-hello | Sep 18 2018 | |||
| 055b8d7fac4b | anciaux | adding the python hello exercise | Sep 18 2018 | |||
| 86c47f885141 | anciaux | Merge branch 'master' of ssh://c4science.ch/source/sp4e | Sep 18 2018 | |||
| 0eaf1cce5579 | anciaux | adding the nodes from the board | Sep 18 2018 | |||
| 9b211c473907 | pundir | Merge branch 'master' of ssh://c4science.ch/source/sp4e | Sep 18 2018 | |||
| f021cb27c790 | pundir | added activate repository in git sujet | Sep 18 2018 | |||
| 88c5ec80d992 | anciaux | remove extra dots | Sep 18 2018 |
