[Tcl-bugs] [tk-commits] - dgp (branch: core-8-5-12-rc) - *MERGE* merge 8.5

[tk-commits <tcl...@tc...>]

Commit by dgp (branch: core-8-5-12-rc):

*MERGE* merge 8.5

http://core.tcl.tk/tk/info/f960e94cbd3becd9c1cbc10e389337b4339657a2

Changeset:

	ChangeLog
	win/makefile.vc