summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2012-11-05 21:00:01 (GMT)
committerdgp <dgp@users.sourceforge.net>2012-11-05 21:00:01 (GMT)
commit3ccad1d5014f9fb98c089fe19bb1fd04f7f8b0db (patch)
tree44eb8c64488f3c3e5541ccf7a966c34f7d75a200
parentdafa4d1504763f0809dfb3fd0ffa19f289a42888 (diff)
parent63b3afad9b516550ffc7b56b1f8536f81fb3c21c (diff)
downloadtk-3ccad1d5014f9fb98c089fe19bb1fd04f7f8b0db.zip
tk-3ccad1d5014f9fb98c089fe19bb1fd04f7f8b0db.tar.gz
tk-3ccad1d5014f9fb98c089fe19bb1fd04f7f8b0db.tar.bz2
merge changes
-rw-r--r--ChangeLog2
-rw-r--r--changes8
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 75aaa8b..8b9887a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,7 +11,7 @@
2012-09-17 Don Porter <dgp@users.sourceforge.net>
- *** 8.6b2 TAGGED FOR RELEASE ***
+ *** 8.6b3 TAGGED FOR RELEASE ***
* macosx/tkMacOSXWm.c: [Bug 3567786] Stop segfault in [wm forget].
diff --git a/changes b/changes
index 25484a3..93945ab 100644
--- a/changes
+++ b/changes
@@ -7015,3 +7015,11 @@ and -to (porter)
Many revisions to better support a Cygwin environment (nijtmans)
--- Released 8.6b3, September 18, 2012 --- See ChangeLog for details ---
+
+2012-10-02 (bug fix)[3572016] menu enable after modal dialog (berg,walzer)
+
+2012-10-08 Remove Carbon support
+
+2012-10-24 (bug fix)[3574893] crash in [wm forget] (porter)
+
+--- Released 8.6.0, ??? ??, 2012 --- See ChangeLog for details ---