comparison mcabber/libjabber/jabber.h @ 300:12f919be3da5

Merge heads
author Mikael Berthe <mikael@lilotux.net>
date Sun, 10 Jul 2005 22:36:55 +0100
parents 1fa1185346be
children 17aa60c6dc63
comparison
equal deleted inserted replaced
299:8af283462e63 300:12f919be3da5