diff options
| author | Daniele Varrazzo <daniele.varrazzo@gmail.com> | 2011-01-01 17:14:54 +0100 |
|---|---|---|
| committer | Daniele Varrazzo <daniele.varrazzo@gmail.com> | 2011-01-01 17:14:54 +0100 |
| commit | 3e94375cf7d196d4d97a0eba05f7527980c72b6d (patch) | |
| tree | ada3416d375591a114285f0cc633c661a582d1f4 /psycopg/python.h | |
| parent | ac258169622ca758757e51338443a4cbed1e605d (diff) | |
| parent | f9be48d89ea73d5d401b6b5b6a271848f259a1c3 (diff) | |
| download | psycopg2-3e94375cf7d196d4d97a0eba05f7527980c72b6d.tar.gz | |
Merge branch 'python2' into python3
Conflicts:
ChangeLog
NEWS-2.3
lib/extensions.py
psycopg/microprotocols.c
setup.py
Diffstat (limited to 'psycopg/python.h')
0 files changed, 0 insertions, 0 deletions