# Conflicts:
#	src/tests/SpheresFromMasks.cpp

     in b34b14e0

- FLOAT->G_FLOAT
- SpheresFunctions::SpheresInterpolator -> SpheresFunctions::Interpolator

ADD: JPEG support in libs/prepareEverything.sh (cause TIFF
     was asking for it on barbora), reflected that in CMakeLists
CHG: TIFF and I3DLIBS are using JPEG now
FIX: GSL asked not to create a shared lib (.so)
FIX: GSL is downloaded via html, not ftp
FIX: libs/addModulesAtIT4I
ADD: module list for salomon @ IT4I

the branch was formerly called as 'meltedAuxBranchesForDistributed'