Mercurial > pidgin
comparison libpurple/protocols/silc/Makefile.am @ 19920:0ed8a2a86a1b
explicit merge of 'fc49baf44017a8fd511c607b435668baf2a0f518'
and 'b50640e3caa45410064cc403c759c1b427800a1e'
to branch 'org.maemo.garage.pidgin.pidgin.dialog-transience'
| author | Gabriel Schulhof <nix@go-nix.ca> |
|---|---|
| date | Fri, 17 Aug 2007 22:10:43 +0000 |
| parents | 441945083737 |
| children | de4914b5e45c 2b62300d2c19 |
comparison
equal
deleted
inserted
replaced
| 19918:dd5e6f06be8f | 19920:0ed8a2a86a1b |
|---|