diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-19 13:39:03 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-19 13:39:03 +0200 |
| commit | 1678a69116d1c6ce900fe15f7813613bb28416dd (patch) | |
| tree | 9589536f6b4bd60b34f90cf5ed20240d40bbb38c /libX11/specs/i18n/framework | |
| parent | 9d911bc1246139019e555f443e934677a067bc0a (diff) | |
| parent | b2c925e360e2c366526de15b44603f855f94139c (diff) | |
| download | vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.gz vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.bz2 vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libfontenc/src/fontenc.c
Diffstat (limited to 'libX11/specs/i18n/framework')
| -rw-r--r-- | libX11/specs/i18n/framework/framework.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libX11/specs/i18n/framework/framework.xml b/libX11/specs/i18n/framework/framework.xml index 4d87d4736..fd88688bc 100644 --- a/libX11/specs/i18n/framework/framework.xml +++ b/libX11/specs/i18n/framework/framework.xml @@ -20,8 +20,10 @@ <affiliation><orgname>IBM Japan</orgname></affiliation> </othercredit> </authorgroup> - <copyright><year>1994</year><holder>TOSHIBA Corporation</holder></copyright> - <copyright><year>1994</year><holder>IBM Corporation</holder></copyright> + <copyright><year>1994</year> + <holder>TOSHIBA Corporation</holder> + <holder>IBM Corporation</holder> + </copyright> <legalnotice> |