sfd
dsff
Merge branch 'master' of github.com:MoppelDerDegu/warping

Conflicts:
	Debug/CL.read.1.tlog
	Debug/CL.write.1.tlog
	Debug/DisparityMapBuilder.obj
	Debug/FileManager.obj
	Debug/Helper.obj
	Debug/ImageEditor.obj
	Debug/ImageSaliencyDetector.obj
	Debug/ImageWarper.obj
	Debug/Main.obj
	Debug/MotionDetector.obj
	Debug/Saliency.obj
	Debug/SaliencyMath.obj
	Debug/StereoImage.obj
	Debug/WarpingStereoVideo.exe
	Debug/WarpingStereoVideo.ilk
	Debug/WarpingStereoVideo.log
	Debug/WarpingStereoVideo.pdb
	Debug/cl.command.1.tlog
	Debug/link.command.1.tlog
	Debug/link.read.1.tlog
	Debug/link.write.1.tlog
	Debug/mt.command.1.tlog
	Debug/mt.read.1.tlog
	Debug/rc.command.1.tlog
	Debug/rc.read.1.tlog
	Debug/rc.write.1.tlog
	Debug/segment-image.obj
	Debug/stdafx.obj
	Debug/vc100.idb
	Debug/vc100.pdb
	ImageWarper.cpp
	WarpingStereoVideo.sdf
	WarpingStereoVideo.suo
	WarpingStereoVideo.vcxproj
	WarpingStereoVideo.vcxproj.filters
gitignore
del
Warning
den shit weg
RightEyeMesh Gerüst