Carlos Martín Nieto 2b5e408029 Merge remote-tracking branch 'upstream/master' into development ...

Reconcile the changes between the ffi changes upstream with the changes
to libgit2 in the dev branch.

Conflicts:
	src/config.c
	src/options.c
	src/refspec.c
	src/remote.c

2014-05-16 04:41:26 +02:00

3.3 KiB

Raw Blame History

View Raw