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 f4cf3931b26b…

Parents 720e4fe9fcdf…

Parents 96b39de1cd9f…

by Adrian Buehlmann

Changes to 2 files · Browse files at f4cf3931b26b Showing diff from parent 720e4fe9fcdf 96b39de1cd9f Diff from another changeset...

Change 1 of 1 Show Entire File win32/​shellext/​Makefile.nmake Stacked
 
47
48
49
50
 
51
52
53
 
47
48
49
 
50
51
52
53
@@ -47,7 +47,7 @@
   THgShell.dll: $(OBJECTS_THGSGELL)   create-parentid-h.cmd - rc shellext.rc + rc $(THG_EXTRA_RCFLAGS) shellext.rc   link /OUT:$@ $(LDFLAGS_THGSHELL) $** shellext.res   mt -nologo -manifest $@.manifest -outputresource:"$@;#2"  
Change 1 of 1 Show Entire File win32/​shellext/​shellext.rc Stacked
 
1
2
3
4
 
 
 
5
6
7
 
1
 
2
3
4
5
6
7
8
9
@@ -1,7 +1,9 @@
 #include "windows.h" -#include "thgversion.h"  #include "parentid.h"   +#ifndef THG_VERSION_FIRST +#include "thgversion.h" +#endif    #define TOSTR(x) #x  #define TOSTR2(x) TOSTR(x)