diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:20:55 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:20:55 -0400 |
| commit | a422142cfdf90d889d8d3e2affb8311a381530b7 (patch) | |
| tree | bde7e2c7a3ee8bca649aecd877a9ee1593f4223e /net/dccp/ccids/lib/tfrc.h | |
| parent | 6fc47e31c0e802d205d67e644f654532e5d365d5 (diff) | |
| parent | 60d4684068ff1eec78f55b5888d0bd2d4cca1520 (diff) | |
| download | blackbird-op-linux-a422142cfdf90d889d8d3e2affb8311a381530b7.tar.gz blackbird-op-linux-a422142cfdf90d889d8d3e2affb8311a381530b7.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'net/dccp/ccids/lib/tfrc.h')
| -rw-r--r-- | net/dccp/ccids/lib/tfrc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/ccids/lib/tfrc.h b/net/dccp/ccids/lib/tfrc.h index 130c4c40cfe3..45f30f59ea2a 100644 --- a/net/dccp/ccids/lib/tfrc.h +++ b/net/dccp/ccids/lib/tfrc.h @@ -4,7 +4,7 @@ * net/dccp/ccids/lib/tfrc.h * * Copyright (c) 2005 The University of Waikato, Hamilton, New Zealand. - * Copyright (c) 2005 Ian McDonald <iam4@cs.waikato.ac.nz> + * Copyright (c) 2005 Ian McDonald <ian.mcdonald@jandi.co.nz> * Copyright (c) 2005 Arnaldo Carvalho de Melo <acme@conectiva.com.br> * Copyright (c) 2003 Nils-Erik Mattsson, Joacim Haggmark, Magnus Erixzon * |
