merge 3.2

This commit is contained in:
Benjamin Peterson 2012-10-12 12:04:32 -04:00
commit 143d034ecd
14 changed files with 242 additions and 240 deletions

View file

@ -595,8 +595,13 @@ def win32_ver(release='',version='',csd='',ptype=''):
release = '7'
else:
release = '2008ServerR2'
elif min == 2:
if product_type == VER_NT_WORKSTATION:
release = '8'
else:
release = '2012Server'
else:
release = 'post2008Server'
release = 'post2012Server'
else:
if not release: