| commit | 154f2b4726ef92e73dbf5d7d8f01df72c2a73101 | [log] [tgz] |
|---|---|---|
| author | Sandro Tosi <sandro.tosi@gmail.com> | Fri Sep 02 21:24:55 2011 +0200 |
| committer | Sandro Tosi <sandro.tosi@gmail.com> | Fri Sep 02 21:24:55 2011 +0200 |
| tree | 84c3e7368894803825befd3f61af69b3cba63f8e | |
| parent | 9b20e27c01ad995c3950f90dae003437a64f4092 [diff] | |
| parent | fbd4fe2195402331b7a529d87b8dcc3f9b81f61d [diff] |
merge with 3.2
diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt index 9180cf7..164c2c1 100644 --- a/Doc/ACKS.txt +++ b/Doc/ACKS.txt
@@ -226,6 +226,7 @@ * Collin Winter * Blake Winton * Dan Wolfe + * Adam Woodbeck * Steven Work * Thomas Wouters * Ka-Ping Yee