Mercurial > pidgin.yaz
comparison libpurple/Makefile.am @ 19536:a77432fe2f3b
merge of '5d55a7b785e21cf51b586dd442481032b187c6c6'
and '98084aa63392b62af11d017ae863f4cb2f43cf83'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Thu, 30 Aug 2007 00:09:47 +0000 |
parents | 7c84cbb57972 47a2d00ab060 |
children | 57d350900136 034a03ae657b |
comparison
equal
deleted
inserted
replaced
19406:7c84cbb57972 | 19536:a77432fe2f3b |
---|---|
34 purple_coresources = \ | 34 purple_coresources = \ |
35 account.c \ | 35 account.c \ |
36 accountopt.c \ | 36 accountopt.c \ |
37 blist.c \ | 37 blist.c \ |
38 buddyicon.c \ | 38 buddyicon.c \ |
39 certificate.c \ | |
39 cipher.c \ | 40 cipher.c \ |
40 circbuffer.c \ | 41 circbuffer.c \ |
41 cmds.c \ | 42 cmds.c \ |
42 connection.c \ | 43 connection.c \ |
43 conversation.c \ | 44 conversation.c \ |
83 purple_coreheaders = \ | 84 purple_coreheaders = \ |
84 account.h \ | 85 account.h \ |
85 accountopt.h \ | 86 accountopt.h \ |
86 blist.h \ | 87 blist.h \ |
87 buddyicon.h \ | 88 buddyicon.h \ |
89 certificate.h \ | |
88 cipher.h \ | 90 cipher.h \ |
89 circbuffer.h \ | 91 circbuffer.h \ |
90 cmds.h \ | 92 cmds.h \ |
91 connection.h \ | 93 connection.h \ |
92 conversation.h \ | 94 conversation.h \ |