diff options
| author | Vicent Marti <tanoku@gmail.com> | 2012-08-02 01:38:30 +0200 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2012-08-02 01:38:30 +0200 |
| commit | e25dda51c4dc47ed99f95dae6486c6275b119484 (patch) | |
| tree | 183114622aa2dfeb224b550a07050f26cd9a0732 /include/git2/object.h | |
| parent | 95a1d876148ff2e09c13537c60e1dc7e10ea9295 (diff) | |
| parent | b8457baae24269c9fb777591e2a0e1b425ba31b6 (diff) | |
| download | libgit2-e25dda51c4dc47ed99f95dae6486c6275b119484.tar.gz | |
Merge remote-tracking branch 'nulltoken/topic/amd64-compat' into development
Conflicts:
src/netops.c
src/netops.h
src/oid.c
Diffstat (limited to 'include/git2/object.h')
| -rw-r--r-- | include/git2/object.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/git2/object.h b/include/git2/object.h index d9e653fd4..722434dec 100644 --- a/include/git2/object.h +++ b/include/git2/object.h @@ -75,7 +75,7 @@ GIT_EXTERN(int) git_object_lookup_prefix( git_object **object_out, git_repository *repo, const git_oid *id, - unsigned int len, + size_t len, git_otype type); /** |