Merge branch 'master' of git@github.com:amusecode/amuse.git

amusecode · Feb 5, 2020 · d5a0800 · d5a0800
2 parents 66719fd + 76777ac
commit d5a0800
Show file tree

Hide file tree

Showing 62 changed files with 327 additions and 1,887 deletions.
diff --git a/doc/kickoff/presentations/AMUSE_workshop_douglas_heggie.pdf b/doc/kickoff/presentations/AMUSE_workshop_douglas_heggie.pdf
diff --git a/doc/kickoff/presentations/AMUSE_workshop_evghenii_gaburov.pdf b/doc/kickoff/presentations/AMUSE_workshop_evghenii_gaburov.pdf
diff --git a/doc/kickoff/presentations/AMUSE_workshop_mark_ridler.pdf b/doc/kickoff/presentations/AMUSE_workshop_mark_ridler.pdf
diff --git a/doc/kickoff/presentations/AMUSE_workshop_mark_ter_linden.pdf b/doc/kickoff/presentations/AMUSE_workshop_mark_ter_linden.pdf
diff --git a/doc/kickoff/presentations/AMUSE_workshop_pelupessy.pdf b/doc/kickoff/presentations/AMUSE_workshop_pelupessy.pdf
diff --git a/doc/kickoff/presentations/AMUSE_workshop_rowin_meijerink.pdf b/doc/kickoff/presentations/AMUSE_workshop_rowin_meijerink.pdf
diff --git a/doc/kickoff/presentations/AMUSE_workshop_seyit_hocuk.pdf b/doc/kickoff/presentations/AMUSE_workshop_seyit_hocuk.pdf
diff --git a/doc/omuse_tutorial/00-OMUSE_Welcome.ipynb b/doc/omuse_tutorial/00-OMUSE_Welcome.ipynb
diff --git a/doc/omuse_tutorial/01-OMUSE_and_AMUSE.ipynb b/doc/omuse_tutorial/01-OMUSE_and_AMUSE.ipynb