diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-21 09:36:35 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-21 09:36:35 (GMT) |
| commit | ae2f2b211d31070531913851b894e2665b544beb (patch) | |
| tree | f85bb98792c720e90346badc16cb7db5dd867027 /win/coffbase.txt | |
| parent | 65d17884a3fc402968d737201112e8006e371434 (diff) | |
| parent | 3b786ffebeb7769d34099ea7064532501dc6aee5 (diff) | |
| download | tcl-ae2f2b211d31070531913851b894e2665b544beb.zip tcl-ae2f2b211d31070531913851b894e2665b544beb.tar.gz tcl-ae2f2b211d31070531913851b894e2665b544beb.tar.bz2 | |
merge core-8-6-branch. Undo changes to coffbase.txt (they cause overlap with Tk)winFixes
Diffstat (limited to 'win/coffbase.txt')
| -rw-r--r-- | win/coffbase.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/win/coffbase.txt b/win/coffbase.txt index 0142bb3..3314f26 100644 --- a/win/coffbase.txt +++ b/win/coffbase.txt @@ -13,8 +13,8 @@ ; linker with the `-base:@$(TCLDIR)\win\coffbase.txt,<key>` option.
tcl 0x10000000 0x00200000
-tcldde 0x10200000 0x00020000
-tclreg 0x10210000 0x00020000
+tcldde 0x10200000 0x00010000
+tclreg 0x10210000 0x00010000
tk 0x10220000 0x00200000
expect 0x10480000 0x00080000
itcl 0x10500000 0x00080000
|