Debug
Merge remote-tracking branch 'origin/master'

Conflicts:
	Debug/Admin.obj
	Debug/CPOA.log
	Debug/CPOA.tlog/CL.write.1.tlog
	Debug/CPOA.tlog/link.read.1.tlog
	Debug/Source.obj
	Debug/vc120.idb
	Debug/vc120.pdb
Merge remote-tracking branch 'origin/master'

Conflicts:
	Debug/CPOA.log
	Debug/CPOA.tlog/rc.read.1.tlog