Mercurial > pidgin
comparison finch/gntmedia.c @ 30086:86c917db4c89
merge of '637cbec3044756a8ef4273f687d84b18f10b05c4'
and '9e9bcdba177b1d4b1f7368101b35c65a5d1c3a65'
author | John Bailey <rekkanoryo@rekkanoryo.org> |
---|---|
date | Sun, 23 May 2010 17:24:05 +0000 |
parents | 259bbfb423d4 |
children | a8cc50c2279f |
comparison
equal
deleted
inserted
replaced
30085:173e403cffbb | 30086:86c917db4c89 |
---|