about summary refs log tree commit diff
path: root/Makeconfig
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2012-01-07 10:39:03 -0500
committerUlrich Drepper <drepper@gmail.com>2012-01-07 10:39:03 -0500
commitfbb68a84ee16345203f896f29b93e92a52582201 (patch)
tree6ea41119ba1f55d479effba3e922845d5f76b9e2 /Makeconfig
parent28926a1be178dd3b5811219e32b0d6b937bf21cf (diff)
parent8ecd6b2a1283a28bcf56cfe48099fafa412a3929 (diff)
downloadglibc-fbb68a84ee16345203f896f29b93e92a52582201.tar.gz
glibc-fbb68a84ee16345203f896f29b93e92a52582201.tar.xz
glibc-fbb68a84ee16345203f896f29b93e92a52582201.zip
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
	ChangeLog
Diffstat (limited to 'Makeconfig')
0 files changed, 0 insertions, 0 deletions