| commit | 116415f80eeb88e1973a160b8a2ee707d24481b4 | |
| author | Ulrich Drepper <drepper@gmail.com> | |
| Tue, 15 Nov 2011 18:29:11 +0000 (15 13:29 -0500) | ||
| committer | Ulrich Drepper <drepper@gmail.com> | |
| Tue, 15 Nov 2011 18:29:11 +0000 (15 13:29 -0500) | ||
| tree | 2dd24107d610a0bdff14fc01a0ded3ffb0b7adf9 | treesnapshot (tar.gz zip) |
| parent | 8056ea641faa89225cffcf8507cd20de95b8b6ae | commitdiff |
| parent | 446514f97eaf555200f9ec4f369223f984e638a5 | commitdiff |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
sysdeps/unix/sysv/linux/clock_gettime.c
Conflicts:
sysdeps/unix/sysv/linux/clock_gettime.c