diff options
author | Ulrich Drepper <drepper@gmail.com> | 2012-01-30 22:34:33 -0500 |
---|---|---|
committer | Ulrich Drepper <drepper@gmail.com> | 2012-01-30 22:34:33 -0500 |
commit | 0eb6f47528cc10645cb0a6919b3af53166ca4fe8 (patch) | |
tree | db61d4a90096b60be41fb33d6d87e79d1d9c3b04 /version.h | |
parent | 27a25b6e633a3ea071e229337eaae36d0fa243fa (diff) | |
parent | c8a89e7dd5cab24242cc9050387bd5bb902da11a (diff) | |
download | glibc-0eb6f47528cc10645cb0a6919b3af53166ca4fe8.tar.gz glibc-0eb6f47528cc10645cb0a6919b3af53166ca4fe8.tar.xz glibc-0eb6f47528cc10645cb0a6919b3af53166ca4fe8.zip |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
Diffstat (limited to 'version.h')
0 files changed, 0 insertions, 0 deletions