Mercurial > pidgin
graph
-
resolved conflict -- merged im.pidgin.pidgin to im.pidgin.soc.2008.yahooWed, 12 Nov 2008 10:23:13 +0000, by Sulabh Mahajan
-
propagate from branch 'im.pidgin.pidgin' (head bc80dc424bc7a7e274901f9124173538e5b43f41)Wed, 12 Nov 2008 10:18:49 +0000, by Sulabh Mahajan
-
resolving conflict - merging im.pidgin.pidgin to im.pidgin.soc.2008.yahooWed, 12 Nov 2008 10:17:38 +0000, by Sulabh Mahajan
-
set yahoo_p2p_server_watcher, yahoo_p2p_server_timeout_handle to 0; check for nonnegative fd instead of nonzero;Wed, 12 Nov 2008 08:19:56 +0000, by Sulabh Mahajan