Merge remote-tracking branch 'origin/master'

hch

2018-08-20 2362341e2a9f8467408ac4b99e1108ace98036fa

1
2
3
4
5
6
// C1 10 ¿ç·þPK»Ö¸´Á¬Ê¤´ÎÊý #tagCMRecoverMergePKWin 
 
struct    tagCMRecoverMergePKWin 
{ 
    tagHead        Head; 
};