diff options
author | Vicent Marti <tanoku@gmail.com> | 2012-08-02 03:38:30 +0400 |
---|---|---|
committer | Vicent Marti <tanoku@gmail.com> | 2012-08-02 03:38:30 +0400 |
commit | e25dda51c4dc47ed99f95dae6486c6275b119484 (patch) | |
tree | 183114622aa2dfeb224b550a07050f26cd9a0732 /src/attr_file.c | |
parent | 95a1d876148ff2e09c13537c60e1dc7e10ea9295 (diff) | |
parent | b8457baae24269c9fb777591e2a0e1b425ba31b6 (diff) |
Merge remote-tracking branch 'nulltoken/topic/amd64-compat' into development
Conflicts:
src/netops.c
src/netops.h
src/oid.c
Diffstat (limited to 'src/attr_file.c')
-rw-r--r-- | src/attr_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/attr_file.c b/src/attr_file.c index 966da4069..20b3cf631 100644 --- a/src/attr_file.c +++ b/src/attr_file.c @@ -179,7 +179,7 @@ int git_attr_file__lookup_one( const char *attr, const char **value) { - unsigned int i; + size_t i; git_attr_name name; git_attr_rule *rule; |