diff options
author | Vicent Martà <tanoku@gmail.com> | 2012-05-05 14:22:53 -0700 |
---|---|---|
committer | Vicent Martà <tanoku@gmail.com> | 2012-05-05 14:22:53 -0700 |
commit | 48ecd122ea6fb8cf12fb4029974c314e5d9efb62 (patch) | |
tree | 88f90fa8c9d903f072a2b1c647c51a9899e520c7 /include/git2.h | |
parent | 2218fd57a50ceb851cb131939bf0747e072e40f6 (diff) | |
parent | 4ef14af93517b3842bc0dfa24147cf10dd029582 (diff) | |
download | libgit2-48ecd122ea6fb8cf12fb4029974c314e5d9efb62.tar.gz |
Merge pull request #659 from libgit2/development-merge
New-error-handling
Diffstat (limited to 'include/git2.h')
-rw-r--r-- | include/git2.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/git2.h b/include/git2.h index 1711ff8be..d75387318 100644 --- a/include/git2.h +++ b/include/git2.h @@ -22,6 +22,7 @@ #include "git2/repository.h" #include "git2/revwalk.h" +#include "git2/merge.h" #include "git2/refs.h" #include "git2/reflog.h" @@ -40,7 +41,7 @@ #include "git2/net.h" #include "git2/status.h" #include "git2/indexer.h" - +#include "git2/submodule.h" #include "git2/notes.h" #endif |