Jeremy Hummel b5fafdb50a Merge branch 'iperov-master' into build/update-from-upstream/2019-10-15
# Conflicts:
#	README.md
#	converters/ConverterConfig.py
#	facelib/LandmarksProcessor.py
#	facelib/S3FDExtractor.py
#	mainscripts/Converter.py
#	mainscripts/Extractor.py
#	mainscripts/Trainer.py
#	mainscripts/gfx/help_converter_masked.jpg
#	models/ModelBase.py
#	models/Model_SAE/Model.py
#	nnlib/device.py
#	samplelib/SampleGeneratorBase.py
#	samplelib/SampleGeneratorFace.py
#	samplelib/SampleProcessor.py
#	utils/Path_utils.py
2019-10-16 23:20:55 -04:00
..
2019-05-11 12:18:43 +04:00
2019-08-22 00:18:53 -07:00
2019-08-22 00:18:53 -07:00
2019-03-26 09:15:22 +04:00
1
2019-09-21 15:19:58 +04:00
2019-10-09 12:01:37 +04:00
2018-06-04 17:12:43 +04:00
2019-02-19 21:45:40 +04:00
2019-02-19 21:45:40 +04:00
2019-02-19 21:45:40 +04:00
2019-02-19 21:45:40 +04:00
2019-02-19 21:45:40 +04:00
2019-10-08 15:09:28 +04:00
2018-07-03 21:42:48 +04:00
2019-10-08 15:09:28 +04:00
2019-10-08 15:09:28 +04:00
2019-08-22 16:27:49 -06:00