Skip to content
Snippets Groups Projects
Commit f2dfefc5 authored by Pavel KORSHUNOV's avatar Pavel KORSHUNOV
Browse files

Merge branch 'master' into 'epoch' 

# Conflicts:
#   bob/learn/tensorflow/loss/NegLogLoss.py
#   bob/learn/tensorflow/network/SequenceNetwork.py
#   bob/learn/tensorflow/network/__init__.py
#   bob/learn/tensorflow/utils/singleton.py
#   buildout.cfg
parents 75be2029 a3fa9ee1
Branches
No related tags found
1 merge request!6Merge branch with audio-stuff into master
Pipeline #
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 330 additions and 833 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment