aboutsummaryrefslogtreecommitdiff
path: root/pthreads/CONTRIBUTORS
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-02-13 11:03:57 +0100
committermarha <marha@users.sourceforge.net>2013-02-13 11:03:57 +0100
commit8fa17b13062c1e2acca542cc7a2ccb09aca874e8 (patch)
tree158a6239b0fdf2abf63fb7365b4cd4886c15f5b1 /pthreads/CONTRIBUTORS
parent4a165ef2f762a4ce9155f2a3626692326bda616d (diff)
parentb41f74438672dd682bc01ae818cb3da654f22c1e (diff)
downloadvcxsrv-8fa17b13062c1e2acca542cc7a2ccb09aca874e8.tar.gz
vcxsrv-8fa17b13062c1e2acca542cc7a2ccb09aca874e8.tar.bz2
vcxsrv-8fa17b13062c1e2acca542cc7a2ccb09aca874e8.zip
Merge remote-tracking branch 'origin/released'
* origin/released: Updated to latest CVS version of pthreads Conflicts: pthreads/Makefile
Diffstat (limited to 'pthreads/CONTRIBUTORS')
-rw-r--r--pthreads/CONTRIBUTORS4
1 files changed, 2 insertions, 2 deletions
diff --git a/pthreads/CONTRIBUTORS b/pthreads/CONTRIBUTORS
index da31ff266..72a7ea260 100644
--- a/pthreads/CONTRIBUTORS
+++ b/pthreads/CONTRIBUTORS
@@ -55,7 +55,7 @@ Rich Peters rpeters at micro-magic dot com
Todd Owen towen at lucidcalm dot dropbear dot id dot au
Bug fixes to dll loading.
Jason Nye jnye at nbnet dot nb dot ca
- Implementation of async cancelation.
+ Implementation of async cancellation.
Fred Forester fforest at eticomm dot net
Kevin D. Clark kclark at cabletron dot com
David Baggett dmb at itasoftware dot com
@@ -116,7 +116,7 @@ Makoto Kato raven at oldskool dot jp
Panagiotis E. Hadjidoukas peh at hpclab dot ceid dot upatras dot gr
phadjido at cs dot uoi dot gr
Contributed the QueueUserAPCEx package which
- makes preemptive async cancelation possible.
+ makes preemptive async cancellation possible.
Will Bryant will dot bryant at ecosm dot com
Borland compiler patch and makefile.
Anuj Goyal anuj dot goyal at gmail dot com