merge trunk; update changescore-8-6-1

FossilOrigin-Name: 51b9512d99499b3156639ffca038b8e76396e032

2 files changed, 12 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 11f639a..7eb5433 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
+A NOTE ON THE CHANGELOG:
+Starting in early 2011, Tk source code has been under the management of
+fossil, hosted at http://core.tcl.tk/tk/ .  Fossil presents a "Timeline"
+view of changes made that is superior in every way to a hand edited log file.
+Because of this, many Tk developers are now out of the habit of maintaining
+this log file.  You may still find useful things in it, but the Timeline is
+a better first place to look now.
+============================================================================
+
 2013-08-30  Don Porter  <dgp@users.sourceforge.net>
 
+	*** 8.6.1 TAGGED FOR RELEASE ***
+
 	* README:		Bump version number to 8.6.1
 	* generic/tk.h:
 	* library/tk.tcl:
diff --git a/changes b/changes
index 77500bc..3ddc4f9 100644
--- a/changes
+++ b/changes
@@ -7072,4 +7072,4 @@ Many revisions to better support a Cygwin environment (nijtmans)
 
 2013-08-25 (bug fix)[3016181] Cocoa: [destroy $scrollbar] => crash (goddard)
 
---- Released 8.6.1, September 18, 2013 --- http://core.tcl.tk/tk/ for details
+--- Released 8.6.1, September 19, 2013 --- http://core.tcl.tk/tk/ for details