equal
deleted
inserted
replaced
1 ############################################################################### |
1 ############################################################################### |
2 # Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. |
3 # |
3 # |
4 # Permission is hereby granted, free of charge, to any person obtaining a |
4 # Permission is hereby granted, free of charge, to any person obtaining a |
5 # copy of this software and associated documentation files (the "Software"), |
5 # copy of this software and associated documentation files (the "Software"), |
6 # to deal in the Software without restriction, including without limitation |
6 # to deal in the Software without restriction, including without limitation |
7 # the rights to use, copy, modify, merge, publish, distribute, sublicense, |
7 # the rights to use, copy, modify, merge, publish, distribute, sublicense, |
19 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
19 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
20 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
21 # DEALINGS IN THE SOFTWARE. |
21 # DEALINGS IN THE SOFTWARE. |
22 # |
22 # |
23 |
23 |
24 diff -urp -x '*~' -x '*.orig' nls/zh_CN.UTF-8/Compose.pre nls/zh_CN.UTF-8/Compose.pre |
24 diff --git a/nls/zh_CN.UTF-8/Compose.pre b/nls/zh_CN.UTF-8/Compose.pre |
25 --- nls/zh_CN.UTF-8/Compose.pre 2010-01-14 17:11:36.000000000 -0800 |
25 index 6c2c411..eb35680 100644 |
26 +++ nls/zh_CN.UTF-8/Compose.pre 2010-06-07 15:49:40.781722582 -0700 |
26 --- a/nls/zh_CN.UTF-8/Compose.pre |
27 @@ -0,0 +1,2538 @@ |
27 +++ b/nls/zh_CN.UTF-8/Compose.pre |
|
28 @@ -1 +1,2538 @@ |
|
29 -include "X11_LOCALEDATADIR/en_US.UTF-8/Compose" |
28 +XCOMM |
30 +XCOMM |
29 +XCOMM Copyright (c) 1996, 2000, Oracle and/or its affiliates. All rights reserved. |
31 +XCOMM Copyright (c) 1996, 2000, Oracle and/or its affiliates. All rights reserved. |
30 +XCOMM |
32 +XCOMM |
31 +XCOMM Compose table for the zh.UTF8 locale |
33 +XCOMM Compose table for the zh.UTF8 locale |
32 +XCOMM |
34 +XCOMM |