diff options
| author | marha <marha@users.sourceforge.net> | 2010-12-19 17:53:16 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-12-19 17:53:16 +0000 |
| commit | 6e799c58fa0e2cf7d9b722e9f1a737ce798ffa94 (patch) | |
| tree | 1b8a0f3f96e34f83306b2b5248f8ca7b09528c01 /pixman/COPYING | |
| parent | e9cda97b38a5987aad2260f5153992d43bec16ce (diff) | |
| parent | b24af6c6af003368ebb5c3e042db0ab7a295d89e (diff) | |
| download | vcxsrv-6e799c58fa0e2cf7d9b722e9f1a737ce798ffa94.tar.gz vcxsrv-6e799c58fa0e2cf7d9b722e9f1a737ce798ffa94.tar.bz2 vcxsrv-6e799c58fa0e2cf7d9b722e9f1a737ce798ffa94.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'pixman/COPYING')
| -rw-r--r-- | pixman/COPYING | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pixman/COPYING b/pixman/COPYING index 47c22c370..11b022bc2 100644 --- a/pixman/COPYING +++ b/pixman/COPYING @@ -19,6 +19,7 @@ possible. They may also add themselves to the list below. * Copyright 2008 Mozilla Corporation
* Copyright 2008 Frederic Plourde
* Copyright 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2009, 2010 Nokia Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
|