diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-01 12:33:20 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-01 12:33:20 +0200 |
| commit | be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779 (patch) | |
| tree | 807b5640d1fedc88ddcda752f101ffdb3071092a /libXpm/COPYING | |
| parent | 11b60c4ebaf348b01051bfff19f947b073028a99 (diff) | |
| parent | 6dd755aa923291db2501cc5c22e409c41a70e3c1 (diff) | |
| download | vcxsrv-be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779.tar.gz vcxsrv-be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779.tar.bz2 vcxsrv-be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Update following packages:
Conflicts:
X11/Xwinsock.h
apps/xhost/xhost.c
libXaw/src/Vendor.c
libXfont/include/X11/fonts/bdfint.h
libXfont/src/fontfile/catalogue.c
Diffstat (limited to 'libXpm/COPYING')
| -rw-r--r-- | libXpm/COPYING | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libXpm/COPYING b/libXpm/COPYING index af4754912..585af0b8f 100644 --- a/libXpm/COPYING +++ b/libXpm/COPYING @@ -44,7 +44,7 @@ Except as contained in this notice, the name of Arnaud LE HORS shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Arnaud LE HORS. -Copyright (C) 19896 Lorens Younes +Copyright (C) 1996 Lorens Younes Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to |