modified:   hoa.library/ext_win_debug/CL.read.1.tlog
	modified:   hoa.library/ext_win_debug/CL.write.1.tlog
	modified:   hoa.library/ext_win_debug/cl.command.1.tlog
	modified:   hoa.library/ext_win_debug/hoa.decoder~.idb
	modified:   hoa.library/ext_win_debug/hoa.decoder~.log
	modified:   hoa.library/ext_win_debug/link.command.1.tlog
	modified:   hoa.library/ext_win_debug/link.read.1.tlog
	modified:   hoa.library/ext_win_debug/link.write.1.tlog
	modified:   hoa.library/ext_win_release/CL.read.1.tlog
	modified:   hoa.library/ext_win_release/CL.write.1.tlog
	modified:   hoa.library/ext_win_release/cl.command.1.tlog
	modified:   hoa.library/ext_win_release/hoa.dac~.exp
	modified:   hoa.library/ext_win_release/hoa.dac~.lib
	modified:   hoa.library/ext_win_release/hoa.dac~.log
	modified:   hoa.library/ext_win_release/hoa.dac~.write.1.tlog
	modified:   hoa.library/ext_win_release/hoa.decoder~.log
	deleted:    hoa.library/ext_win_release/hoa.decoder~.unsuccessfulbuild
	modified:   hoa.library/ext_win_release/hoa.decoder~.write.1.tlog
	modified:   hoa.library/ext_win_release/link.command.1.tlog
	modified:   hoa.library/ext_win_release/link.read.1.tlog
	modified:   hoa.library/ext_win_release/link.write.1.tlog
	modified:   hoa.library/hoaBinaural/AmbisonicBinaural.cpp
	deleted:    hoa.library/hoaBinaural/AmbisonicBinaural.h
	modified:   hoa.library/hoaBinaural/ambisonicDecode.cpp
	deleted:    hoa.library/hoaBinaural/ambisonicDecode.h
	deleted:    hoa.library/hoaBinaural/fileLoader.c
	deleted:    hoa.library/hoaBinaural/fileLoader.h
	deleted:    hoa.library/hoaBinaural/gslMatrix.c
	deleted:    hoa.library/hoaBinaural/gslMatrix.h
	deleted:    hoa.library/hoaBinaural/hoa.binaural~.c
	modified:   hoa.library/hoaDac/hoa.dac~.c
	modified:   hoa.library/hoaDac/hoa.dac~.vcxproj
	modified:   hoa.library/hoaDecoder/ambisonicDecode.cpp
	modified:   hoa.library/hoaDecoder/ambisonicDecode.hpp
	modified:   hoa.library/hoaDecoder/hoa.decoder~.cpp
	modified:   hoa.library/hoaDecoder/hoa.decoder~.vcxproj
	deleted:    hoa.library/hoaDecoder/matrixHandling.h
	deleted:    hoa.library/hoaDecoder/matrixInverse.h
	deleted:    hoa.library/hoaEncoder/AmbisonicEncode.h
	deleted:    hoa.library/hoaEncoder/hoa.encoder~.c
	deleted:    hoa.library/hoaPlug/hoa.plug~.h
	modified:   hoa.library/hoaProjector/ambisonicProjector.cpp
	modified:   hoa.library/hoaProjector/ambisonicProjector.h
	deleted:    hoa.library/hoaProjector/gslMatrix.c
	deleted:    hoa.library/hoaProjector/gslMatrix.h
	modified:   hoa.library/hoaProjector/hoa.projector~.cpp
	modified:   hoa.library/hoaRecomposer/ambisonicRecomposer.cpp
	deleted:    hoa.library/hoaRecomposer/ambisonicRecomposer.h
	deleted:    hoa.library/hoaRecomposer/gslMatrix.c
	deleted:    hoa.library/hoaRecomposer/gslMatrix.h
	modified:   hoa.library/hoaRecomposer/hoa.recomposer~.cpp
	deleted:    hoa.library/hoaRecomposer/matrixHandling.h
	deleted:    hoa.library/hoaRecomposer/matrixInverse.h
	deleted:    hoa.library/hoaRotate/ambisonicRotate.h
	deleted:    hoa.library/hoaRotate/hoa.rotate~.c
	deleted:    hoa.library/hoaRotate/readme
	deleted:    sdk-build/hoa.*~.maxpat
	modified:   sdk-build/hoa.binaural~.maxhelp
	modified:   sdk-build/hoa.scope.maxhelp
	deleted:    sdk-build/hoaLibrary/operators/hoa.*~.maxpat
Commit pour windows
Merge branch 'master' of https://github.com/CICM/CICM-Library

Conflicts:
	hoa.library/hoaEncoder/hoa.encoder~.c
	sdk-build/hoa.binaural~.maxhelp
	sdk-build/hoa.scope.maxhelp

	deleted:    hoa.library/Info copy 2.plist
	modified:   hoa.library/hoaConnect/hoa.connect.c
	new file:   hoa.library/hoaEncoder/hoa.encoder~.c
	new file:   hoa.library/hoaLoader/hoa.loader.c
	new file:   hoa.library/hoaLoader/hoa.loader.xcodeproj/project.pbxproj
	new file:   hoa.library/hoaMeter/hoa.meter.def
	new file:   hoa.library/hoaMeter/hoa.meter.vcxproj
	new file:   hoa.library/hoaMeter/hoa.meter~.c
	renamed:    hoa.library/hoaScope/hoa.scope.xcodeproj/project.pbxproj -> hoa.library/hoaMeter/hoa.meter~.xcodeproj/project.pbxproj
	deleted:    hoa.library/hoaScope/hoa.scope.c
	new file:   hoa.library/hoaScope/hoa.scope~.c
	new file:   hoa.library/hoaScope/hoa.scope~.xcodeproj/project.pbxproj
	deleted:    hoaLibrary.zip
	deleted:    sdk-build.zip
	new file:   sdk-build/Hoa.signalToPackedDatas.maxpat
	modified:   sdk-build/hoa.am~.maxhelp
	modified:   sdk-build/hoa.am~.maxpat
	modified:   sdk-build/hoa.binaural~.maxhelp
	modified:   sdk-build/hoa.connect.maxhelp
	modified:   sdk-build/hoa.connect.mxo/Contents/MacOS/hoa.connect
	modified:   sdk-build/hoa.dac~.maxhelp
	modified:   sdk-build/hoa.decoder~.maxhelp
	modified:   sdk-build/hoa.delay~.maxhelp
	modified:   sdk-build/hoa.encoder~.maxhelp
	modified:   sdk-build/hoa.fracorder~.maxhelp
	modified:   sdk-build/hoa.grain~.maxhelp
	new file:   sdk-build/hoa.iPad.jzml
	new file:   sdk-build/hoa.iPad.maxpat
	modified:   sdk-build/hoa.inside~.maxhelp
	modified:   sdk-build/hoa.inside~.maxpat
	modified:   sdk-build/hoa.kinect2~.maxhelp
	renamed:    sdk-build/hoa.mixer~.maxhelp -> sdk-build/hoa.meter~.maxhelp
	renamed:    sdk-build/hoa.scope.mxo/Contents/Info.plist -> sdk-build/hoa.meter~.mxo/Contents/Info.plist
	renamed:    sdk-build/hoa.scope.mxo/Contents/PkgInfo -> sdk-build/hoa.meter~.mxo/Contents/PkgInfo
	modified:   sdk-build/hoa.mirror~.maxhelp
	new file:   sdk-build/hoa.mixerOrder.maxpat
	modified:   sdk-build/hoa.mixer~.maxhelp
	modified:   sdk-build/hoa.play~.maxhelp
	modified:   sdk-build/hoa.plug~.maxhelp
	modified:   sdk-build/hoa.projector~.maxhelp
	modified:   sdk-build/hoa.recomposer~.maxhelp
	deleted:    sdk-build/hoa.reflexion~.maxpat
	modified:   sdk-build/hoa.roomEffect~.maxhelp
	modified:   sdk-build/hoa.rotate~.maxhelp
	modified:   sdk-build/hoa.scope.maxhelp
	deleted:    sdk-build/hoa.scope.mxo/Contents/MacOS/hoa.scope
	new file:   sdk-build/hoa.scope~.maxhelp
	renamed:    hoa.library/Info copy 3.plist -> sdk-build/hoa.scope~.mxo/Contents/Info.plist
	new file:   sdk-build/hoa.scope~.mxo/Contents/PkgInfo
	modified:   sdk-build/hoa.snapshot~.maxpat
	modified:   sdk-build/hoa.stochdelay~.maxhelp
	new file:   sdk-build/hoa.switch~.maxpat
	modified:   sdk-build/hoa.trajectory.maxhelp
	renamed:    hoa.library/Info copy.plist -> sdk-build/hoa.trajectory.mxo/Contents/Info.plist
	new file:   sdk-build/hoa.trajectory.mxo/Contents/MacOS/hoa.trajectory
	new file:   sdk-build/hoa.trajectory.mxo/Contents/PkgInfo
	new file:   sdk-build/hoaLibrary/operators/hoa.!d~.maxpat
	renamed:    sdk-build/hoaLibrary/operators/hoa.~.maxpat -> sdk-build/hoaLibrary/operators/hoa.%~.maxpat
	new file:   sdk-build/hoaLibrary/operators/hoa.-~.maxpat
	new file:   sdk-build/hoaLibrary/operators/hoa.d~.maxpat