summaryrefslogtreecommitdiff
path: root/THANKS
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2013-06-03 15:25:50 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2013-06-03 15:25:50 +0200
commit6d03501bcae9249dd87dad2cb7feb78d5fcfd89a (patch)
treeab765d1b7998bdf66ed486cbfb5a8abc96a561bd /THANKS
parentb3bf07f7716a9bf965e9cfefa4131a478a188a27 (diff)
parenta7cf36aeb8a2f42108f16fd7de7131385bd7ca1c (diff)
downloadautomake-6d03501bcae9249dd87dad2cb7feb78d5fcfd89a.tar.gz
Merge branch 'micro' into maint
* micro: NEWS: minor fixlets, re-wording, and better text wrapping tests: slightly stricter checks in t/cxx-demo.sh tests: fix spurious failure when 'etags' program is Exuberant Ctags tests: fix spurious failure due to missing sleeps
Diffstat (limited to 'THANKS')
-rw-r--r--THANKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/THANKS b/THANKS
index 07b8e9f04..763c285e5 100644
--- a/THANKS
+++ b/THANKS
@@ -67,6 +67,7 @@ Christian Cornelssen ccorn@cs.tu-berlin.de
Christina Gratorp christina.gratorp@gmail.com
Claudio Fontana sick_soul@yahoo.it
Clifford Wolf clifford@clifford.at
+Colin Watson cjwatson@ubuntu.com
Dagobert Michelsen dam@opencsw.org
Daiki Ueno ueno@unixuser.org
Dalibor Topic robilad@kaffe.org