summaryrefslogtreecommitdiff
path: root/src/commit.h
diff options
context:
space:
mode:
authorVicent Marti <tanoku@gmail.com>2011-12-14 03:32:49 +0100
committerVicent Marti <tanoku@gmail.com>2011-12-14 03:32:49 +0100
commit16a9f32abd9b038cb07e419e646ebf3aab520796 (patch)
tree1ec7b81692243b34ea2150f3424adb7cd49fc6b1 /src/commit.h
parentbf6d2717ab3b1a23ac7bd7f400518bbd6845c2f1 (diff)
parenta7954d2a5a950c6e2162fee3001ccbc18a7acea4 (diff)
downloadlibgit2-16a9f32abd9b038cb07e419e646ebf3aab520796.tar.gz
Merge remote-tracking branch 'nulltoken/topic/oid-generation' into development
Conflicts: tests-clay/clay.h tests-clay/clay_main.c
Diffstat (limited to 'src/commit.h')
0 files changed, 0 insertions, 0 deletions