diff options
| author | Daniel Atallah <datallah@pidgin.im> | 2015-06-18 09:54:08 -0400 |
|---|---|---|
| committer | Daniel Atallah <datallah@pidgin.im> | 2015-06-18 09:54:08 -0400 |
| commit | 4222c6f76b5bd6305be4b7db33e2c4f74bfd067a (patch) | |
| tree | 4bd625e80db4bd34e59711a0247efbd010fc5549 /COPYRIGHT | |
| parent | fa49939d96b0afe919533fef2b736c974b4b0b96 (diff) | |
| parent | 632bf785ffa9422ec5582a8576c0dcdeffbdab95 (diff) | |
| download | pidgin-4222c6f76b5bd6305be4b7db33e2c4f74bfd067a.tar.gz | |
Merge with release-2.x.y (with some manual merge fixes, most notably in pidgin/plugins/notify.c)
Diffstat (limited to 'COPYRIGHT')
| -rw-r--r-- | COPYRIGHT | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -486,6 +486,7 @@ Carsten Schaar Toby Schaffer Jonathan Schleifer <js-pidgin@webkeks.org> Luke Schierer +Sebastian Schmidt <yath@yath.de> Ralph Schmieder David Schmitt Heiko Schmitt |