Rocco Rutte:

- merge in latest mutt changes

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@335 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/ChangeLog.mutt b/ChangeLog.mutt
index 926d9d4..876a7cb 100644 (file)
--- a/ChangeLog.mutt
+++ b/ChangeLog.mutt
@@ -1,3 +1,9 @@
+2005-07-23 23:35:17  Byrial Jensen  <byrial@image.dk>  (brendan)
+
+       * curs_main.c, doc/manual.sgml.head, globals.h, main.c, muttlib.c:
+       Byrial Jensen and Christoph Berg's current-mailbox shortcut (^). I
+       like it, and so does Debian.
+
 2005-07-17 00:43:05  Brendan Cully  <brendan@kublai.com>  (brendan)
 
        * account.c: Don't dereference null ImapUser in new getlogin
@@ -461,7 +467,7 @@
 2005-01-29 19:15:07  Thomas Glanzmann  <sithglan@stud.uni-erlangen.de>  (roessler)
                                  
      * hcache.c: - make hcache.c conform to mutt codingstyle
-     - use $Id: ChangeLog,v 3.432 2005/07/17 00:44:49 brendan Exp $ CVS keyword instead of %K% BitKeeper keyword
+     - use $Id: ChangeLog,v 3.433 2005/07/23 23:37:05 brendan Exp $ CVS keyword instead of %K% BitKeeper keyword
                                  
 2005-01-29 19:15:07  Thomas Glanzmann  <sithglan@stud.uni-erlangen.de>  (roessler)
 

diff --git a/UPGRADING b/UPGRADING
index 0075102..96a4970 100644 (file)
--- a/UPGRADING
+++ b/UPGRADING
@@ -10,6 +10,11 @@ This document is not the place for verbose documentation; it only offers
 the necessary keywords to look them up in the manual, ChangeLog or other
 sources of information.
 
+2005-24-07:
+
+  The '^' shortcut pointing to the current folder is no longer
+  only available in muttng as it has been integrated into mutt, too.
+
 2005-07-16:
 
   The 'prepare' script has been renamed to 'autogen.sh' as this name