diff options
| author | John Ehresman <jpe@wingware.com> | 2010-04-16 16:07:02 -0400 |
|---|---|---|
| committer | John Ehresman <jpe@wingware.com> | 2010-04-16 16:07:02 -0400 |
| commit | d570e692a648daab52297f0f9b331a75d231c89f (patch) | |
| tree | 41a861e5a57f4cd20d73f8500180e1dc70c07056 /NEWS | |
| parent | 2e2fd145a4f09b67cd014d2eb9f9db5e1715f7ab (diff) | |
| parent | 695ac7bc5c60371a32538d690c7a15509f3c9637 (diff) | |
| download | pygobject-d570e692a648daab52297f0f9b331a75d231c89f.tar.gz | |
Merge branch master into py3k
Conflicts:
dsextras.py
gio/giomodule.c
gobject/constants.py
gobject/gobjectmodule.c
setup.py
Diffstat (limited to 'NEWS')
0 files changed, 0 insertions, 0 deletions