Merge remote-tracking branch 'origin/master'
# Conflicts: # .idea/medienverarbeitung17.projectmood.iml # .idea/misc.xml # projectmood/main.py
.idea/modules.xml
deleted
100644 → 0
.idea/vcs.xml
deleted
100644 → 0
appnope==0.1.0 | |||
bleach==2.1.1 | |||
cycler==0.10.0 | cycler==0.10.0 | ||
decorator==4.1.2 | |||
entrypoints==0.2.3 | |||
html5lib==1.0b10 | |||
ipykernel==4.6.1 | |||
ipython==6.2.1 | |||
ipython-genutils==0.2.0 | |||
ipywidgets==7.0.3 | |||
jedi==0.11.0 | |||
Jinja2==2.9.6 | |||
jsonschema==2.6.0 | |||
jupyter==1.0.0 | |||
jupyter-client==5.1.0 | |||
jupyter-console==5.2.0 | |||
jupyter-core==4.3.0 | |||
MarkupSafe==1.0 | |||
matplotlib==2.1.0 | matplotlib==2.1.0 | ||
mistune==0.7.4 | |||
nbconvert==5.3.1 | |||
nbformat==4.4.0 | |||
notebook==5.2.0 | |||
numpy==1.13.3 | numpy==1.13.3 | ||
opencv-python==3.3.0.10 | opencv-python==3.3.0.10 | ||
pandocfilters==1.4.2 | |||
parso==0.1.0 | |||
pexpect==4.2.1 | |||
pickleshare==0.7.4 | |||
prompt-toolkit==1.0.15 | |||
ptyprocess==0.5.2 | |||
Pygments==2.2.0 | |||
pyparsing==2.2.0 | pyparsing==2.2.0 | ||
python-dateutil==2.6.1 | python-dateutil==2.6.1 | ||
pytz==2017.2 | pytz==2017.2 | ||
pyzmq==16.0.2 | |||
qtconsole==4.3.1 | |||
simplegeneric==0.8.1 | |||
six==1.11.0 | six==1.11.0 | ||
terminado==0.6 | tblib==1.3.2 | ||
testpath==0.3.1 | virtualenv==15.1.0 | ||
tornado==4.5.2 | |||
traitlets==4.3.2 | |||
wcwidth==0.1.7 | |||
webencodings==0.5.1 | |||
widgetsnbextension==3.0.6 |
Please register or sign in to comment