diff options
| author | Thomas Schwinge <thomas@schwinge.name> | 2011-10-20 17:04:43 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@schwinge.name> | 2011-10-20 17:07:46 +0200 |
| commit | 081c7aeb4d4de82ab615db565c60dd776a385c34 (patch) | |
| tree | 2730963b4c865851b0a17d65d03ba7131245785f /include/pthread/pthread.h | |
| parent | 75f6fe21205a87d1942492cb34e8aab482008a78 (diff) | |
| parent | 577976c386d89696ec392fdfbb77ea153ddd6588 (diff) | |
Merge branch 'tls'
Conflicts:
ChangeLog
Makefile
pthread/pt-exit.c
pthread/pt-internal.h
sysdeps/mach/hurd/ia32/pt-setup.c
sysdeps/mach/hurd/pt-docancel.c
sysdeps/mach/hurd/pt-sysdep.h
Diffstat (limited to 'include/pthread/pthread.h')
0 files changed, 0 insertions, 0 deletions