diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2014-08-30 08:30:00 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2014-08-30 08:30:00 (GMT) |
| commit | bbf5dede141290a90faaa2bbf2e8abba59d33c04 (patch) | |
| tree | f87da8347e09b16d012c4371d03ae0d45c7549f8 /win | |
| parent | 2cfb3e19d01d75ab35c7cfeff3ec37c23dd34a4f (diff) | |
| parent | 7bb34adfdb3692426a742497b53ccc8ae43b4892 (diff) | |
| download | tcl-bbf5dede141290a90faaa2bbf2e8abba59d33c04.zip tcl-bbf5dede141290a90faaa2bbf2e8abba59d33c04.tar.gz tcl-bbf5dede141290a90faaa2bbf2e8abba59d33c04.tar.bz2 | |
merge trunk
Diffstat (limited to 'win')
| -rwxr-xr-x | win/configure | 2 | ||||
| -rw-r--r-- | win/configure.in | 2 | ||||
| -rw-r--r-- | win/tclooConfig.sh | 2 | ||||
| -rw-r--r-- | win/tclsh.exe.manifest.in | 18 |
4 files changed, 21 insertions, 3 deletions
diff --git a/win/configure b/win/configure index 2affd38..cf2b201 100755 --- a/win/configure +++ b/win/configure @@ -1311,7 +1311,7 @@ SHELL=/bin/sh TCL_VERSION=8.6 TCL_MAJOR_VERSION=8 TCL_MINOR_VERSION=6 -TCL_PATCH_LEVEL=".1" +TCL_PATCH_LEVEL=".2" VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION TCL_DDE_VERSION=1.4 diff --git a/win/configure.in b/win/configure.in index 77e0327..aa47505 100644 --- a/win/configure.in +++ b/win/configure.in @@ -14,7 +14,7 @@ SHELL=/bin/sh TCL_VERSION=8.6 TCL_MAJOR_VERSION=8 TCL_MINOR_VERSION=6 -TCL_PATCH_LEVEL=".1" +TCL_PATCH_LEVEL=".2" VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION TCL_DDE_VERSION=1.4 diff --git a/win/tclooConfig.sh b/win/tclooConfig.sh index 08cc4c5..14b0d8d 100644 --- a/win/tclooConfig.sh +++ b/win/tclooConfig.sh @@ -16,4 +16,4 @@ TCLOO_STUB_LIB_SPEC="" TCLOO_INCLUDE_SPEC="" TCLOO_PRIVATE_INCLUDE_SPEC="" TCLOO_CFLAGS="" -TCLOO_VERSION=1.0.1 +TCLOO_VERSION=1.0.2 diff --git a/win/tclsh.exe.manifest.in b/win/tclsh.exe.manifest.in index aaa34e1..b7c4381 100644 --- a/win/tclsh.exe.manifest.in +++ b/win/tclsh.exe.manifest.in @@ -30,4 +30,22 @@ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> </application> </compatibility> + <asmv3:application> + <asmv3:windowsSettings + xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings"> + <dpiAware>true</dpiAware> + </asmv3:windowsSettings> + </asmv3:application> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="@MACHINE@" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> </assembly> |