Merge branch 'master' into gdbus-codegen
authorDavid Zeuthen <davidz@redhat.com>
Fri, 29 Apr 2011 16:01:35 +0000 (12:01 -0400)
committerDavid Zeuthen <davidz@redhat.com>
Fri, 29 Apr 2011 16:01:35 +0000 (12:01 -0400)
commit0e352fdb182e63ff163b0feda198cb3b6b20aa3a
treef8cb1ec9f2489ea6d89164c0fdccd38e29e97bb2
parent0377fe7005d95afcbefd067d566fe558030485ab
parent9eba49a982e94196f90c79c5eac4a00cc437b12e
Merge branch 'master' into gdbus-codegen
configure.ac
docs/reference/gio/gio-sections.txt
gio/gdbusprivate.c
gio/gdbusproxy.c
gio/gio.symbols
gio/gioenums.h