diff options
| author | Vicent Marti <tanoku@gmail.com> | 2013-04-22 16:41:56 +0200 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2013-04-22 16:41:56 +0200 |
| commit | 0edad3cc0451a42b566d70f64611acc214a03022 (patch) | |
| tree | 9a7c4c7e7ab0be366df168b7f1750f58b8bd86ae /src/odb_pack.c | |
| parent | 4ef2c79cb6dc81e17b68ccf7c270bcc7e4f85bfb (diff) | |
| parent | f063a75882769cb6fc652de425ac16ba4b88b616 (diff) | |
| download | libgit2-vmg/dupe-odb-backends.tar.gz | |
Merge branch 'development' into vmg/dupe-odb-backendsvmg/dupe-odb-backends
Conflicts:
src/odb.c
Diffstat (limited to 'src/odb_pack.c')
| -rw-r--r-- | src/odb_pack.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/odb_pack.c b/src/odb_pack.c index 7240a4ac7..773e14974 100644 --- a/src/odb_pack.c +++ b/src/odb_pack.c @@ -8,7 +8,8 @@ #include "common.h" #include <zlib.h> #include "git2/repository.h" -#include "git2/oid.h" +#include "git2/indexer.h" +#include "git2/sys/odb_backend.h" #include "fileops.h" #include "hash.h" #include "odb.h" |