diff options
| author | Mark Doliner <mark@kingant.net> | 2014-01-20 00:02:17 -0800 |
|---|---|---|
| committer | Mark Doliner <mark@kingant.net> | 2014-01-20 00:02:17 -0800 |
| commit | 0d2a4cb240d1ae64770ba4e733e4d6d58030b570 (patch) | |
| tree | 55559507318137e9acc0693ce7b26944b008c017 /COPYRIGHT | |
| parent | b5aff6e87e95dbbe22ef4954fa66c67212156fe5 (diff) | |
| parent | f3d015406fa412f2145dc6c5ba8941c2efa37262 (diff) | |
| download | pidgin-0d2a4cb240d1ae64770ba4e733e4d6d58030b570.tar.gz | |
Merge with a fair number of conflicts. Nothing too crazy.
I didn't merge a lot of changes from 07e827917960
libpurple/protocols/gg/gg.c I think maybe that code has either been
removed or changed significantly in main.
Diffstat (limited to 'COPYRIGHT')
| -rw-r--r-- | COPYRIGHT | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -350,6 +350,7 @@ Mihály Mészáros Robert Mibus David Michael Lars T. Mikkelsen +Mantas Mikulėnas Benjamin Miller Kevin Miller Paul Miller |