OSDN Git Service

Merge remote branch 'origin/master' into nptl
authorAustin Foxley <austinf@cetoncorp.com>
Mon, 12 Apr 2010 13:18:10 +0000 (06:18 -0700)
committerAustin Foxley <austinf@cetoncorp.com>
Mon, 12 Apr 2010 13:18:10 +0000 (06:18 -0700)
commit6cc4f58c6382c850ce97f32f56d1a3ff00ca4585
tree19a2f25da5db93c2cb620c0da3c38d3bffd0b784
parentc58dd2b2aabda615aa333cdbb023defbf00b30a3
parente90c33f951efc032ca23f48326343a83c0b54b10
Merge remote branch 'origin/master' into nptl

Conflicts:
libc/unistd/confstr.c

Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Makefile.in
include/libc-symbols.h
utils/.gitignore