diff options
| author | Egbert Eich <eich@freedesktop.org> | 2004-03-05 12:46:31 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@freedesktop.org> | 2004-03-05 12:46:31 +0000 |
| commit | d3155ca48830b450957f9fdf47a7fbb07ffc7cb3 (patch) | |
| tree | 0be90f963309ba76b45efdf5b15c7c3f484fd551 | |
| parent | 6e8dc17dba9e108191a9aa7b5de7313fbad17424 (diff) | |
- removing ': ' from lines which broke the build. These were added by a broken script that automatically removed spurious conflitcs do to CVS tag mismatches. The 'XdotOrg' tag really haunts me!XORG-RELEASE-1-TM-BASE
| -rw-r--r-- | nls/zh_CN.UTF-8/XLC_LOCALE.pre | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nls/zh_CN.UTF-8/XLC_LOCALE.pre b/nls/zh_CN.UTF-8/XLC_LOCALE.pre index eb37b96..44b737f 100644 --- a/nls/zh_CN.UTF-8/XLC_LOCALE.pre +++ b/nls/zh_CN.UTF-8/XLC_LOCALE.pre @@ -2,7 +2,7 @@ XCOMM XFree86 NLS for Chinese locale zh_CN.UTF-8 XCOMM Modified from xc/nls/XLC_LOCALE/en_US.UTF-8 XCOMM by James Su <suzhe@turbolinux.com.cn> XCOMM -: XCOMM $XdotOrg: lib/X11/nls/zh_CN.UTF-8/XLC_LOCALE.pre,v 1.1.4.1.4.1 2004-03-04 17:47:16 eich Exp $ +XCOMM $XdotOrg: lib/X11/nls/zh_CN.UTF-8/XLC_LOCALE.pre,v 1.1.4.1.4.2 2004-03-05 12:46:31 eich Exp $ XCOMM $XFree86$ XCOMM |