Merge branch 'develop' of github.com:ChristianTremblay/BAC0 into develop · ChristianTremblay/BAC0@d0298bd · GitHub

Commit

Merge branch 'develop' of github.com:ChristianTremblay/BAC0 into develop

Browse files

Conflicts:
	BAC0/core/app/ScriptApplication.py
	BAC0/core/io/Read.py
	BAC0/infos.py

Signed-off-by: Christian Tremblay <christian.tremblay@servisys.com>

Loading branch information

ChristianTremblay committed Mar 7, 2017

2 parents 8c08598 + b821f3c commit d0298bd