diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-10 15:05:45 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-10 15:05:45 +0200 |
| commit | 4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8 (patch) | |
| tree | 3ddf28be6916dd5ea27837431b5be8c94017cd9a /libXpm/COPYRIGHT | |
| parent | 5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8 (diff) | |
| parent | 5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6 (diff) | |
| download | vcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.tar.gz vcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.tar.bz2 vcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libXpm/COPYRIGHT')
| -rw-r--r-- | libXpm/COPYRIGHT | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libXpm/COPYRIGHT b/libXpm/COPYRIGHT index 446fa4cd8..378d5636a 100644 --- a/libXpm/COPYRIGHT +++ b/libXpm/COPYRIGHT @@ -23,9 +23,9 @@ * in this Software without prior written authorization from GROUPE BULL. */ -Arnaud LE HORS BULL Research FRANCE -- Koala Project +Arnaud LE HORS BULL Research FRANCE -- Koala Project (XPM - X PixMap format version 2 & 3) Internet: lehors@sophia.inria.fr -Surface Mail: Arnaud LE HORS, INRIA - Sophia Antipolis, +Surface Mail: Arnaud LE HORS, INRIA - Sophia Antipolis, 2004, route des Lucioles, 06565 Valbonne Cedex -- FRANCE Voice phone: (33) 93.65.77.71, Fax: (33) 93 65 77 66, Telex: 97 00 50 F |