Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Caesar2011
2018-04-25 12:12:02 +02:00
3 changed files with 387 additions and 2 deletions

3
.gitignore vendored
View File

@@ -12,3 +12,6 @@ __pycache__/
# docker
.docker_cid
Dockerfile
# Pycharm / Jetbrains IDEs
.idea/

View File

@@ -19,8 +19,8 @@
"## Introduction to Python / Numpy\n",
"\n",
"* [Learn Python in 15 minutes](https://learnxinyminutes.com/docs/python3/): We will use Python 3.\n",
"* [Numpy for Matlab Users](https://docs.scipy.org/doc/numpy-dev/user/numpy-for-matlab-users.html#general-purpose-equivalents)\n",
"* [Numpy Quickstart](https://docs.scipy.org/doc/numpy-dev/user/quickstart.html)\n",
"* [Numpy for Matlab Users](https://docs.scipy.org/doc/numpy/user/numpy-for-matlab-users.html#general-purpose-equivalents)\n",
"* [Numpy Quickstart](https://docs.scipy.org/doc/numpy/user/quickstart.html)\n",
"\n",
"## Libraries\n",
"\n",

File diff suppressed because one or more lines are too long