Merge branch 'R_10_00' of http://10.65.20.17:7990/scm/campo/campo into R_10_00

# Conflicts:
#	src/fp/fplib01.cpp
This commit is contained in:
Mattia Tollari 2018-10-10 10:11:53 +02:00
commit 867557b25b

Diff Content Not Available