Mercurial > ~mikael > mcabber > hg
diff mcabber/src/roster.h @ 300:12f919be3da5
Merge heads
author | Mikael Berthe <mikael@lilotux.net> |
---|---|
date | Sun, 10 Jul 2005 22:36:55 +0100 |
parents | 49e9e02dd6d0 |
children | 45076d02eeef 33b8e801ffa6 |
author | Mikael Berthe <mikael@lilotux.net> |
---|---|
date | Sun, 10 Jul 2005 22:36:55 +0100 |
parents | 49e9e02dd6d0 |
children | 45076d02eeef 33b8e801ffa6 |