[Pidgin] #1187: Send Custom Emoticons in MSN

[Pidgin]

#1187: Send Custom Emoticons in MSN
-----------------------+----------------------------------------------------
  Reporter:  salinasv  |       Owner:  rlaager 
      Type:  patch     |      Status:  assigned
  Priority:  minor     |   Milestone:  2.2.3   
 Component:  MSN       |     Version:  2.0     
Resolution:            |    Keywords:          
   Pending:  0         |  
-----------------------+----------------------------------------------------
Comment (by rlaager):

 Twain28: You need to setup a 3-way merge program and do an actual merge.
 That's really the heart of what needs to be done here.

 And yes, we've since used some of the reserved pointers for other things.
 The merge should be pretty straightforward if you weren't using one of
 them. If you were, catch someone on IRC and we can talk about.

 salinasv: If you want to work on this, I'm around today. Start by
 following my instructions from earlier and then carry on as I've mentioned
 in this posting.

-- 
Ticket URL: <http://developer.pidgin.im/ticket/1187#comment:63>
Pidgin <http://pidgin.im>
Pidgin