Mercurial > pidgin.yaz
diff libpurple/savedstatuses.c @ 26021:25aadd8c3ec7
Fix merge.
author | Mike Ruprecht <maiku@soc.pidgin.im> |
---|---|
date | Sun, 19 Oct 2008 04:55:34 +0000 (2008-10-19) |
parents | 98fd7c994d68 |
children | a946cffda321 a6e3cb32cdd2 |
author | Mike Ruprecht <maiku@soc.pidgin.im> |
---|---|
date | Sun, 19 Oct 2008 04:55:34 +0000 (2008-10-19) |
parents | 98fd7c994d68 |
children | a946cffda321 a6e3cb32cdd2 |