Search
Merge branch 'master' of https://github.com/dolgovz/dsqcpp

Conflicts:
	Debug/strix.exe
	Debug/strix.pdb
	ipch/strix-4863bb36/strix-aca09286.ipch
	strix.sdf
	strix.suo
	strix/Debug/Lots.obj
	strix/Debug/main.obj
	strix/Debug/strix.log
	strix/Debug/vc100.idb
	strix/Debug/vc100.pdb
	strix/lots.dev