Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

merge with stable

Changeset d9a487705a3f…

Parents 560cfbdf1889…

Parents 9ec0603c416a…

by Steve Borho

Changes to 3 files · Browse files at d9a487705a3f Showing diff from parent 560cfbdf1889 9ec0603c416a Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​win32/​mercurial.iss Stacked
 
60
61
62
63
64
 
 
65
66
67
 
60
61
62
 
 
63
64
65
66
67
@@ -60,8 +60,8 @@
 Source: dist\*.exe; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete  Source: dist\*.dll; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete  Source: dist\library.zip; DestDir: {app} -Source: doc\build\pdf\*.pdf; DestDir: {app}\docs; Flags: external skipifsourcedoesntexist -Source: doc\build\chm\*.chm; DestDir: {app}\docs; Flags: external skipifsourcedoesntexist +Source: doc\build\pdf\*.pdf; DestDir: {app}/docs; Flags: +Source: doc\build\chm\*.chm; DestDir: {app}/docs; Flags:  Source: icons\*; DestDir: {app}\icons; Flags: ignoreversion recursesubdirs createallsubdirs  Source: dist\gtk\*; DestDir: {app}\gtk; Flags: ignoreversion recursesubdirs createallsubdirs  Source: locale\*.*; DestDir: {app}\locale; Flags: recursesubdirs createallsubdirs
Change 1 of 1 Show Entire File doc/​source/​faq.txt Stacked
 
18
19
20
21
 
22
23
24
 
18
19
20
 
21
22
23
24
@@ -18,7 +18,7 @@
   *How can I get translations for the Explorer context menu?*   - See the `Download <http://bitbucket.org/tortoisehg/stable/wiki/install>`_ + See the `Download <http://bitbucket.org/tortoisehg/stable/wiki/download>`_   wiki page    *How do I do merges and arbitrary version checkouts in 0.8?*
Change 1 of 1 Show Entire File doc/​source/​intro.txt Stacked
 
78
79
80
81
 
82
83
84
 
78
79
80
 
81
82
83
84
@@ -78,7 +78,7 @@
   The Windows shell extension context menus get their translations from  the Windows registry. Translations for many locales are available from -the TortoiseHg `wiki <http://bitbucket.org/tortoisehg/stable/wiki/install>`_. +the TortoiseHg `wiki <http://bitbucket.org/tortoisehg/stable/wiki/download>`_.  Once the desidered file is downloaded (rename it to :file:`.reg` if the  extension is :file:`.txt`), double-click on it and confirm all the requests.