Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

Merge with stable

Changeset d9e4d2976b56…

Parents 96601bd9273e…

Parents a51bc9725e12…

by Adrian Buehlmann

Changes to one file · Browse files at d9e4d2976b56 Showing diff from parent 96601bd9273e a51bc9725e12 Diff from another changeset...

Change 1 of 2 Show Entire File setup.py Stacked
 
15
16
17
 
 
18
19
20
 
112
113
114
115
116
 
 
 
 
 
 
117
118
 
 
119
120
121
122
 
 
123
124
125
 
15
16
17
18
19
20
21
22
 
114
115
116
 
 
117
118
119
120
121
122
123
 
124
125
126
127
128
 
129
130
131
132
133
@@ -15,6 +15,8 @@
 from distutils.command.build import build  from distutils.spawn import spawn, find_executable   +thgcopyright = 'Copyright (C) 2010 Steve Borho and others' +hgcopyright = 'Copyright (C) 2005-2010 Matt Mackall and others'    class build_mo(build):   @@ -112,14 +114,20 @@
  }   }   extra['console'] = [ - {'script':'contrib/hg', 'icon_resources':[(0,'icons/hg.ico')]}, - {'script':'hgtk', 'icon_resources':[(0,'icons/thg_logo.ico')]}, + {'script':'contrib/hg', + 'icon_resources':[(0,'icons/hg.ico')], + 'copyright':hgcopyright}, + {'script':'hgtk', + 'icon_resources':[(0,'icons/thg_logo.ico')], + 'copyright':thgcopyright},   {'script':'contrib/docdiff.py', - 'icon_resources':[(0,'icons/TortoiseMerge.ico')]} + 'icon_resources':[(0,'icons/TortoiseMerge.ico')], + 'copyright':thgcopyright}   ]   extra['windows'] = [   {'script':'thgtaskbar.py', - 'icon_resources':[(0,'icons/thg_logo.ico')]} + 'icon_resources':[(0,'icons/thg_logo.ico')], + 'copyright':thgcopyright}   ]     return _scripts, _packages, _data_files, extra