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 9ea75bd3a7df…

Parents a518c4e9f78b…

Parents b5112753470f…

by Adrian Buehlmann

Changes to 3 files · Browse files at 9ea75bd3a7df Showing diff from parent a518c4e9f78b b5112753470f Diff from another changeset...

Change 1 of 1 Show Entire File .hgignore Stacked
 
21
22
23
 
24
25
26
 
21
22
23
24
25
26
27
@@ -21,6 +21,7 @@
 *.idb  *.pdb  *.manifest +*.res  glob:win32/shellext/shellext.ncb  glob:win32/shellext/shellext.suo  glob:win32/shellext/Debug/
Change 1 of 1 Show Entire File win32/​shellext/​Makefile.nmake Stacked
 
42
43
44
45
 
46
47
48
 
 
49
50
51
 
42
43
44
 
45
46
47
 
48
49
50
51
52
@@ -42,10 +42,11 @@
 all: THgShell.dll terminate.exe    clean: - del *.obj *.dll *.exe *.lib *.exp *.manifest + del *.obj *.dll *.exe *.lib *.exp *.manifest *.res    THgShell.dll: $(OBJECTS_THGSGELL) - link /OUT:$@ $(LDFLAGS_THGSHELL) $** + rc shellext.rc + link /OUT:$@ $(LDFLAGS_THGSHELL) $** shellext.res   mt -nologo -manifest $@.manifest -outputresource:"$@;#2"    dirstate.exe: dirstate.obj $(OBJECTS_DIRSTATE)
Change 1 of 1 Show Entire File win32/​shellext/​shellext.rc Stacked
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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
@@ -0,0 +1,36 @@
+#include "windows.h" + + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 0,10,0,0 + PRODUCTVERSION 0,10,0,0 + 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 "FileVersion", "0, 10, 0, 0" + VALUE "InternalName", "shellext" + VALUE "LegalCopyright", "Copyright (C) 2010" + VALUE "OriginalFilename", "ThgShell.dll" + VALUE "ProductName", "TortoiseHg Shell Extension Dynamic Link Library" + VALUE "ProductVersion", "0, 10, 0, 0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END