diff options
| author | Vicent Marti <tanoku@gmail.com> | 2012-05-19 03:46:11 +0400 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2012-05-19 03:46:11 +0400 |
| commit | 5b9fac39d8a76b9139667c26a63e6b3f204b3977 (patch) | |
| tree | e6ba28025f92c16563c4ffa8bc60b95f17d69691 /include/git2.h | |
| parent | 7ef9f1b5606c2672105ecbbf34c022a71ef212fe (diff) | |
| parent | ad5df35a47d56c3d716d7a56eac4aeb611987c11 (diff) | |
Merge branch 'development'v0.17.0
Conflicts:
.travis.yml
Diffstat (limited to 'include/git2.h')
| -rw-r--r-- | include/git2.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/git2.h b/include/git2.h index 73b23aa63..d75387318 100644 --- a/include/git2.h +++ b/include/git2.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 the libgit2 contributors + * Copyright (C) 2009-2012 the libgit2 contributors * * This file is part of libgit2, distributed under the GNU GPL v2 with * a Linking Exception. For full terms see the included COPYING file. @@ -13,7 +13,6 @@ #include "git2/common.h" #include "git2/threads.h" #include "git2/errors.h" -#include "git2/zlib.h" #include "git2/types.h" @@ -23,6 +22,7 @@ #include "git2/repository.h" #include "git2/revwalk.h" +#include "git2/merge.h" #include "git2/refs.h" #include "git2/reflog.h" @@ -31,6 +31,7 @@ #include "git2/commit.h" #include "git2/tag.h" #include "git2/tree.h" +#include "git2/diff.h" #include "git2/index.h" #include "git2/config.h" @@ -40,5 +41,7 @@ #include "git2/net.h" #include "git2/status.h" #include "git2/indexer.h" +#include "git2/submodule.h" +#include "git2/notes.h" #endif |