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/submodule.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/submodule.c')
-rw-r--r-- | src/submodule.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/submodule.c b/src/submodule.c index 2fdaf2f77..0a22e3b13 100644 --- a/src/submodule.c +++ b/src/submodule.c @@ -7,6 +7,7 @@ #include "common.h" #include "git2/config.h" +#include "git2/sys/config.h" #include "git2/types.h" #include "git2/repository.h" #include "git2/index.h" |