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 1ec645c00a96…

Parents ee51a4735fb3…

Parents fc7b51cbf3a3…

by Steve Borho

Changes to one file · Browse files at 1ec645c00a96 Showing diff from parent ee51a4735fb3 fc7b51cbf3a3 Diff from another changeset...

Change 1 of 3 Show Entire File win32/​shellext/​shellext.rc Stacked
 
16
17
18
 
 
 
19
20
21
 
27
28
29
30
 
 
31
32
33
 
49
50
51
52
 
53
54
55
 
56
57
 
58
59
60
 
16
17
18
19
20
21
22
23
24
 
30
31
32
 
33
34
35
36
37
 
53
54
55
 
56
57
58
 
59
60
 
61
62
63
64
@@ -16,6 +16,9 @@
 #define THG_VERSION_THIRD 0  #endif   +#ifndef THG_PRODUCT_ID +#define THG_PRODUCT_ID ? +#endif    #define TOSTR(x) #x  #define TOSTR2(x) TOSTR(x) @@ -27,7 +30,8 @@
  TOSTR2(THG_VERSION_FIRST) "." \   TOSTR2(THG_VERSION_SECOND) "." \   TOSTR2(THG_VERSION_THIRD) "-" \ - TOSTR2(THG_PARENT_ID) + TOSTR2(THG_PARENT_ID) " / " \ + TOSTR2(THG_PRODUCT_ID)      VS_VERSION_INFO VERSIONINFO @@ -49,12 +53,12 @@
  BEGIN   VALUE "Comments", "TortoiseHg Shell Extension"   VALUE "CompanyName", "TortoiseHg Project" - VALUE "FileDescription", "TortoiseHg Shell Extension Dynamic Link Library" + VALUE "FileDescription", "TortoiseHg Shell Extension"   VALUE "FileVersion", THG_VERSION_STRING   VALUE "InternalName", "shellext" - VALUE "LegalCopyright", "Copyright (C) 2010" + VALUE "LegalCopyright", "Copyright (C) 2010 Steve Borho and others"   VALUE "OriginalFilename", "ThgShell.dll" - VALUE "ProductName", "TortoiseHg Shell Extension Dynamic Link Library" + VALUE "ProductName", "TortoiseHg"   VALUE "ProductVersion", THG_VERSION_STRING   END   END