sync with 0.7.4cvs26

diff --git a/ChangeLog b/ChangeLog
index f96f5397e30fbfdecfc06cc35c19d7358ced9fca..93a10624ce883b276a68924bcff1caf388b87b80 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-01
+
+       * src/summaryview.[ch]: trim the tail of folder name and selected
+         number on the status label if the space is not enough.
+
 2002-04-01
 
        * src/imap.c: imap_create_special_folder(): fixed a bug that didn't

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 05f6803df53b2bc33058946e4b3f670c7592a45e..8593ece2b3a41c9359e0842a33ac8b16f03ac3cf 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,11 +1,16 @@
-2002-04-01 [match]     0.7.4claws60
+2002-04-02 [paul]      0.7.4claws62
+
+       * sync with 0.7.4cvs26
+               see ChangeLog entry 2002-04-01
+
+2002-04-02 [match]     0.7.4claws61
 
        * src/pine.[ch]
        * src/importpine.[ch]
        * src/addressbook.c
                import Pine address book.
 
-2002-04-01 [match]     0.7.4claws60
+2002-04-02 [match]     0.7.4claws60
 
        * src/addrharvest.[ch]
                improve address parsing of funky addresses.

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 64783d1a8db96a8d727c74afef1cb9ae14d55618..9b1e5bf54b08ef9094cf566a25e3a65e37a18e49 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,8 @@
+2002-04-01
+
+       * src/summaryview.[ch]: ¥¹¥Ú¡¼¥¹¤¬½½Ê¬¤Ë¤Ê¤±¤ì¤Ð¥¹¥Æ¡¼¥¿¥¹¥é¥Ù¥ë¤Î
+         ¥Õ¥©¥ë¥À̾¤ÈÁªÂò¿ô¤ÎËöÈø¤òºï¤ë¤è¤¦¤Ë¤·¤¿¡£
+
 2002-04-01
 
        * src/imap.c: imap_create_special_folder(): INBOX ¤Î²¼¤ËÆÃÊÌ¥Õ¥©¥ë¥À

diff --git a/configure.in b/configure.in
index 5b607716ff339a4a3e43fda9fa92aab282a3fd7f..e5411b94f2f5558128473631afefda591b47a70b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws61
+EXTRA_VERSION=claws62
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target