Mercurial > pidgin
comparison libpurple/blist.c @ 20096:2a9f3a499b0d
merge of '34d642b12b7215d55fd032cd513a7e225715f19a'
and '7868c3b2b7d17c52916e4bb76305b7e3b68d3904'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Mon, 17 Sep 2007 03:47:45 +0000 |
parents | 44b4e8bd759b |
children | 859087457089 |
comparison
equal
deleted
inserted
replaced
19936:191fa8a8c0bc | 20096:2a9f3a499b0d |
---|---|
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 * GNU General Public License for more details. | 16 * GNU General Public License for more details. |
17 * | 17 * |
18 * You should have received a copy of the GNU General Public License | 18 * You should have received a copy of the GNU General Public License |
19 * along with this program; if not, write to the Free Software | 19 * along with this program; if not, write to the Free Software |
20 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
21 * | 21 * |
22 */ | 22 */ |
23 #include "internal.h" | 23 #include "internal.h" |
24 #include "blist.h" | 24 #include "blist.h" |
25 #include "conversation.h" | 25 #include "conversation.h" |