OSDN Git Service

Merge remote branch 'origin/master' into nptl_merge
authorAustin Foxley <austinf@cetoncorp.com>
Sun, 22 Nov 2009 19:46:31 +0000 (11:46 -0800)
committerAustin Foxley <austinf@cetoncorp.com>
Sun, 22 Nov 2009 19:51:37 +0000 (11:51 -0800)
commitf757db2d319ccc5f7034165046fb2bb58901afb1
tree7dc465febb3a802d3f0e8856fcda856b13b04c0a
parent76c0c0ed99f74b8a5965be6e1c6a0c0e7a72513c
parentb71274eebd68b7c68ab95c856f8075bdf4524cd7
Merge remote branch 'origin/master' into nptl_merge

Conflicts:
Rules.mak
libc/misc/sysvipc/msgq.c
test/Rules.mak

Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Makefile.in
Rules.mak
libc/misc/sysvipc/msgq.c
libc/sysdeps/linux/common/_exit.c
test/Test.mak