diff options
| author | Mark Doliner <mark@kingant.net> | 2014-11-04 22:15:01 -0800 |
|---|---|---|
| committer | Mark Doliner <mark@kingant.net> | 2014-11-04 22:15:01 -0800 |
| commit | 3aeaf033961df3b843dd0731ba4d39aba58bd8b9 (patch) | |
| tree | d5bc5aa2b88c72cfdf8ff9b713d0cbba680bce35 /COPYRIGHT | |
| parent | 03abd5b3d5f20540990ed6954fc49ab40c9e38e0 (diff) | |
| parent | 3dfef3c946e47c9cf7a30d5f600a1b2fb0b5dd35 (diff) | |
| download | pidgin-3aeaf033961df3b843dd0731ba4d39aba58bd8b9.tar.gz | |
Merge release-2.x.y branch into master.
Minor manual merging in pidgin/gtkdialogs.c.
Diffstat (limited to 'COPYRIGHT')
| -rw-r--r-- | COPYRIGHT | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -21,6 +21,7 @@ Mark Saleem Abdulrasool Jakub Adam Dave Ahlswede +Haval A. Ahmed Thijs Alkemade Manuel Amador Matt Amato |