normal
Merge branch 'master' of github.com:yedaoq/YedaoqTestSpace

Conflicts:
	GDITestSpace/IconSize/IconSize.rc
	GDITestSpace/IconSize/IconSize.vcproj
	GDITestSpace/IconSize/IconSizeDlg.cpp
	GDITestSpace/IconSize/IconSizeDlg.h
	GDITestSpace/IconSize/resource.h