← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

Merge reports-conflict-resolved into 638451-malformed

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
692
692
    dll_excludes.extend(["MSWSOCK.dll",
693
693
                         "MSVCP60.dll",
694
694
                         "MSVCP90.dll",
695
 
                         "powrprof.dll"])
 
695
                         "powrprof.dll",
 
696
                         "SHFOLDER.dll"])
696
697
    options_list = {"py2exe": {"packages": packages + list(additional_packages),
697
698
                               "includes": includes,
698
699
                               "excludes": excludes,