summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorJohn Bailey <rekkanoryo@rekkanoryo.org>2009-07-06 06:04:34 +0000
committerJohn Bailey <rekkanoryo@rekkanoryo.org>2009-07-06 06:04:34 +0000
commitb5f3b5119af2ac77f956387242165824b8dc34ba (patch)
treec188d5b73a1ac5b19bb6c071564de3fd52132332 /ChangeLog
parent1abae99552936a7fb4053fc749dcb987ce66756b (diff)
parentec870cbeadeafe3b29d4d202759e0b8504ad4d6f (diff)
downloadpidgin-b5f3b5119af2ac77f956387242165824b8dc34ba.tar.gz
propagate from branch 'im.pidgin.cpw.rekkanoryo.yahoo.separate_prpls' (head 1c99d31c85e20c70f330ebe29a548b3036b5cd7e)
to branch 'im.pidgin.pidgin' (head 8d75ebb8ba36d541f5e3f3234798b5b09028d41a)
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f4358592ee..4b347f91f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -81,13 +81,16 @@ version 2.6.0 (??/??/2009):
* Display kicks (and the reasons given) in chat rooms when an occupant is
kicked.
- Yahoo:
+ Yahoo!/Yahoo! JAPAN:
* P2P file transfers. (Sulabh Mahajan)
* Sending text messages (address to +<countrycode><phone number>).
(Sulabh Mahajan)
* Addition of MSN buddies to Yahoo accounts by adding them as
'msn/buddy@somedomain.com' is now supported. (Sulabh Mahajan)
* Further fixes for buddy pictures, aliases etc.
+ * Yahoo! and Yahoo! JAPAN are now two separate protocol plugins that share
+ common protocol code. You can now have the same account on both
+ networks.
Pidgin:
* Added -f command line option to tell Pidgin to ignore NetworkManager