]> git.proxmox.com Git - libgit2.git/commit
Merge branch 'development' into rev-parse
authorBen Straub <bstraub@github.com>
Tue, 5 Jun 2012 19:52:44 +0000 (12:52 -0700)
committerBen Straub <bstraub@github.com>
Tue, 5 Jun 2012 19:52:44 +0000 (12:52 -0700)
commit56a5000d580ef5c9605bc9076610b5af9aa67518
tree4026c8333991fbe221a17b5d16e5e4b52f66cb20
parente267c9fc1a4910d1081e97b4d7a411658ddc0def
parent01dbe273c9b6f86a613b67cee27212cf4bacf4c0
Merge branch 'development' into rev-parse

Conflicts:
src/util.h
tests-clar/refs/branches/listall.c
src/signature.c
src/util.h
src/win32/posix.h
tests-clar/network/remotelocal.c
tests-clar/refs/branches/listall.c