summaryrefslogtreecommitdiff
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorTomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>2013-03-18 12:50:51 +0100
committerTomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>2013-03-18 12:50:51 +0100
commitba684fbc42aecdcb5dd7342bb695f010c106e3eb (patch)
tree62633c2f52b0309161f9e479adf859981b365446 /COPYRIGHT
parent94f30f826c1fb8499f7e1ad0ce6ea7bd7c860d86 (diff)
parentca459726f83e96ef4e99938d82c87a1934326391 (diff)
downloadpidgin-ba684fbc42aecdcb5dd7342bb695f010c106e3eb.tar.gz
Merge with default
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT3
1 files changed, 2 insertions, 1 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 57004ec43c..973050f385 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -15,7 +15,7 @@ If concerns are raised as to the copyright holder of a particular
piece of code, then that code should be traced through our version
control system to see from where it came and who has modified it.
-Copyright (C) 1998-2012 by the following:
+Copyright (C) 1998-2013 by the following:
Mark
Saleem Abdulrasool
@@ -543,6 +543,7 @@ Arun A. Tharuvai
Cestonaro Thilo
Will Thompson
Douglas Thrift (douglaswth)
+Niels Thykier
Mark Tiefenbruck
Andrew Tinney
Jeffery To