diff options
author | Ulrich Drepper <drepper@gmail.com> | 2010-10-19 12:47:13 -0400 |
---|---|---|
committer | Ulrich Drepper <drepper@gmail.com> | 2010-10-19 12:47:13 -0400 |
commit | 6ce0bb748d7de856cb2076b41625fe7cedac5e16 (patch) | |
tree | f55b2908bb8b2f28cc80e6753d47161b46aa58c7 /iconvdata/utf-16.c | |
parent | 475facd1f553ad6d45de1137bd2a22e70307c7bf (diff) | |
parent | 7c08a05c5f4f86f9e249c2554b1628da0f812364 (diff) | |
download | glibc-6ce0bb748d7de856cb2076b41625fe7cedac5e16.tar.gz glibc-6ce0bb748d7de856cb2076b41625fe7cedac5e16.tar.xz glibc-6ce0bb748d7de856cb2076b41625fe7cedac5e16.zip |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
Diffstat (limited to 'iconvdata/utf-16.c')
0 files changed, 0 insertions, 0 deletions