diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-22 15:42:49 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-22 15:42:49 +0200 |
| commit | 46d4f558531910ca1f3297da85b99334d6de2921 (patch) | |
| tree | 60c37077eb160948fe317a17ec4c19bef679aa35 /libX11/specs/i18n | |
| parent | 0bf6df93b9fdbb7902bf1014d605c6876a3ad035 (diff) | |
| parent | c1e6c7428a8d2c1b60ffac7df7a3f56c300fa983 (diff) | |
| download | vcxsrv-46d4f558531910ca1f3297da85b99334d6de2921.tar.gz vcxsrv-46d4f558531910ca1f3297da85b99334d6de2921.tar.bz2 vcxsrv-46d4f558531910ca1f3297da85b99334d6de2921.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/Xext/dpms.c
xorg-server/Xext/saver.c
xorg-server/Xext/security.c
xorg-server/Xext/shape.c
xorg-server/Xext/sync.c
xorg-server/Xi/opendev.c
xorg-server/fb/wfbrename.h
xorg-server/glx/glxserver.h
xorg-server/hw/xwin/winwindowswm.c
xorg-server/mi/miarc.c
xorg-server/mi/miwideline.c
xorg-server/os/io.c
xorg-server/render/mipict.c
Diffstat (limited to 'libX11/specs/i18n')
| -rw-r--r-- | libX11/specs/i18n/localedb/localedb.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libX11/specs/i18n/localedb/localedb.xml b/libX11/specs/i18n/localedb/localedb.xml index 6b81b771c..c2feccff8 100644 --- a/libX11/specs/i18n/localedb/localedb.xml +++ b/libX11/specs/i18n/localedb/localedb.xml @@ -16,10 +16,9 @@ <affiliation><orgname>IBM Japan</orgname></affiliation> </author> </authorgroup> + <copyright><year>1994</year><holder>IBM Corporation</holder></copyright> <legalnotice> - -<para role="multiLicensing">Copyright © 1994 IBM Corporation</para> <para> License to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice @@ -36,7 +35,9 @@ OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER I AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. </para> +</legalnotice> +<legalnotice> <para role="multiLicensing">Copyright © 1994 X Consortium</para> <para> Permission is hereby granted, free of charge, to any person obtaining a copy |