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...

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
 
 
 
19
20
21
22
23
24
25
26
27
28
29
30
 
 
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
 
53
54
55
 
56
57
 
58
59
60
61
62
63
64
65
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
 
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
 
56
57
58
 
59
60
 
61
62
63
64
65
66
67
68
69
 #include "windows.h"  #include "parentid.h"    #ifndef THG_VERSION_FIRST  /* dummy version for shellext development */  #define THG_VERSION_FIRST 0  #define THG_VERSION_SECOND 0  #define THG_VERSION_THIRD 55555  #endif    #ifndef THG_VERSION_SECOND  #define THG_VERSION_SECOND 0  #endif    #ifndef THG_VERSION_THIRD  #define THG_VERSION_THIRD 0  #endif   +#ifndef THG_PRODUCT_ID +#define THG_PRODUCT_ID ? +#endif    #define TOSTR(x) #x  #define TOSTR2(x) TOSTR(x)    #define THG_VERSION_BINARY \   THG_VERSION_FIRST, THG_VERSION_SECOND, THG_VERSION_THIRD, 0    #define THG_VERSION_STRING \   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   FILEVERSION THG_VERSION_BINARY   PRODUCTVERSION THG_VERSION_BINARY   FILEFLAGSMASK 0x17L  #ifdef _DEBUG   FILEFLAGS 0x1L  #else   FILEFLAGS 0x0L  #endif   FILEOS 0x4L   FILETYPE 0x2L   FILESUBTYPE 0x0L  BEGIN   BLOCK "StringFileInfo"   BEGIN   BLOCK "040904b0"   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   BLOCK "VarFileInfo"   BEGIN   VALUE "Translation", 0x409, 1200   END  END