diff options
| author | Russ Allbery <rra@stanford.edu> | 2010-03-08 10:57:43 -0800 |
|---|---|---|
| committer | Russ Allbery <rra@stanford.edu> | 2010-03-08 10:57:43 -0800 |
| commit | bc74e98546f6d291c8b4fde55d2d3b62ac876831 (patch) | |
| tree | 4810b8a40368d84cc11e18a07fb2401c85314b7c /client | |
| parent | 98ba541f3b5e3d63604d29412847ec4d807e8e16 (diff) | |
| parent | 602ff7584d3668c36b1bf5fd43988e6f45eceb48 (diff) | |
Merge commit 'upstream/0.11' into debian
Diffstat (limited to 'client')
| -rw-r--r-- | client/krb5.c | 3 | ||||
| -rw-r--r-- | client/wallet.1 | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/client/krb5.c b/client/krb5.c index 38172ae..aad39f6 100644 --- a/client/krb5.c +++ b/client/krb5.c @@ -10,10 +10,9 @@ */ #include <config.h> +#include <portable/krb5.h> #include <portable/system.h> -#include <krb5.h> - #include <client/internal.h> #include <util/messages-krb5.h> #include <util/messages.h> diff --git a/client/wallet.1 b/client/wallet.1 index 5d5a8bf..7d7004f 100644 --- a/client/wallet.1 +++ b/client/wallet.1 @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "WALLET 1" -.TH WALLET 1 "2010-02-21" "0.10" "wallet" +.TH WALLET 1 "2010-03-08" "0.11" "wallet" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l |