projects
/
platform
/
upstream
/
glibc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8056ea6
446514f
)
Merge branch 'master' of ssh://sourceware.org/git/glibc
author
Ulrich Drepper
<drepper@gmail.com>
Tue, 15 Nov 2011 18:29:11 +0000
(13:29 -0500)
committer
Ulrich Drepper
<drepper@gmail.com>
Tue, 15 Nov 2011 18:29:11 +0000
(13:29 -0500)
Conflicts:
sysdeps/unix/sysv/linux/clock_gettime.c
Trivial merge