Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset b654d2d8513d…

Parents 90f70d7822bb…

Parents afa14c7858a1…

by Steve Borho

Changes to one file · Browse files at b654d2d8513d Showing diff from parent 90f70d7822bb afa14c7858a1 Diff from another changeset...

Change 1 of 2 Show Entire File setup.py Stacked
 
116
117
118
 
119
120
121
122
 
123
124
125
 
130
131
132
 
133
134
135
 
116
117
118
119
120
121
122
123
124
125
126
127
 
132
133
134
135
136
137
138
@@ -116,10 +116,12 @@
  extra['console'] = [   {'script':'contrib/hg',   'icon_resources':[(0,'icons/hg.ico')], + 'description':'Mercurial Distributed SCM',   'copyright':hgcopyright,   'product_version':version},   {'script':'hgtk',   'icon_resources':[(0,'icons/thg_logo.ico')], + 'description':'TortoiseHg GUI tools for Mercurial SCM',   'copyright':thgcopyright,   'product_version':version},   {'script':'contrib/docdiff.py', @@ -130,6 +132,7 @@
  extra['windows'] = [   {'script':'thgtaskbar.py',   'icon_resources':[(0,'icons/thg_logo.ico')], + 'description':'TortoiseHg Overlay Icon Server',   'copyright':thgcopyright,   'product_version':version}   ]