summaryrefslogtreecommitdiffstats
path: root/chat-im/pidgin/CONFLICTS
AgeCommit message (Expand)Author
2008-08-24pidgin: Conflicts carrierGeorge Sherwood
2008-05-04pidgin: Added conflicts funpidginGeorge Sherwood
2007-05-05gaim: Deprecated in favour of pidgin due to renaing of gaimGeorge Sherwood