diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-06-09 07:03:25 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-06-09 07:03:25 -0400 |
| commit | 8621fc3b996a7bf5d60a0fb86cb15a078dcbf542 (patch) | |
| tree | 4562f9f46110fae25edad559c80cc1bfd47abce5 /version.h | |
| parent | e80fab373c5cf01246e6acd302795b13dc50d175 (diff) | |
| parent | 9b849836f534bbd250a6733ebc1edf32e5f4d5dc (diff) | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
ChangeLog
Diffstat (limited to 'version.h')
0 files changed, 0 insertions, 0 deletions