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/options.c | |
| parent | 6fc47e31c0e802d205d67e644f654532e5d365d5 (diff) | |
| parent | 60d4684068ff1eec78f55b5888d0bd2d4cca1520 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'net/dccp/options.c')
| -rw-r--r-- | net/dccp/options.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/options.c b/net/dccp/options.c index daf72bb671f0..07a34696ac97 100644 --- a/net/dccp/options.c +++ b/net/dccp/options.c | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * An implementation of the DCCP protocol | 4 | * An implementation of the DCCP protocol |
| 5 | * Copyright (c) 2005 Aristeu Sergio Rozanski Filho <aris@cathedrallabs.org> | 5 | * Copyright (c) 2005 Aristeu Sergio Rozanski Filho <aris@cathedrallabs.org> |
| 6 | * Copyright (c) 2005 Arnaldo Carvalho de Melo <acme@ghostprotocols.net> | 6 | * Copyright (c) 2005 Arnaldo Carvalho de Melo <acme@ghostprotocols.net> |
| 7 | * Copyright (c) 2005 Ian McDonald <iam4@cs.waikato.ac.nz> | 7 | * Copyright (c) 2005 Ian McDonald <ian.mcdonald@jandi.co.nz> |
| 8 | * | 8 | * |
| 9 | * This program is free software; you can redistribute it and/or | 9 | * This program is free software; you can redistribute it and/or |
| 10 | * modify it under the terms of the GNU General Public License | 10 | * modify it under the terms of the GNU General Public License |