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

..

__init__.py

Config: move to cffi

2014-04-21 14:11:41 +02:00

config.py

Merge remote-tracking branch 'upstream/master' into development

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

credentials.py

Remote: get rid of the C code

2014-04-14 11:42:51 +02:00

decl.h

Merge remote-tracking branch 'upstream/master' into development

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

errors.py

Config: move to cffi

2014-04-21 14:11:41 +02:00

ffi.py

ffi: style changes

2014-04-16 22:17:20 +02:00

refspec.py

Merge remote-tracking branch 'upstream/master' into development

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

remote.py

Merge remote-tracking branch 'upstream/master' into development

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

repository.py

Merge pull request #361 from carlosmn/cffi-config

2014-04-26 16:39:50 +02:00

settings.py

Settings: add documentation

2014-03-24 01:44:36 +01:00

version.py

Get ready to release 0.20.3

2014-04-02 22:28:18 +02:00