[glib/gdbus-codegen: 87/87] Merge branch 'master' into gdbus-codegen
- From: David Zeuthen <davidz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/gdbus-codegen: 87/87] Merge branch 'master' into gdbus-codegen
- Date: Fri, 29 Apr 2011 16:07:48 +0000 (UTC)
commit 0e352fdb182e63ff163b0feda198cb3b6b20aa3a
Merge: 0377fe7 9eba49a
Author: David Zeuthen <davidz redhat com>
Date: Fri Apr 29 12:01:35 2011 -0400
Merge branch 'master' into gdbus-codegen
NEWS | 88 +-
README.in | 2 +-
build/win32/vs10/Makefile.am | 4 +
build/win32/vs10/glib-compile-schemas.vcxproj | 174 ++
.../vs10/glib-compile-schemas.vcxproj.filters | 17 +
build/win32/vs10/glib.props | 8 +
build/win32/vs10/glib.sln | 36 +
build/win32/vs10/gsettings.vcxproj | 174 ++
build/win32/vs10/gsettings.vcxproj.filters | 14 +
build/win32/vs9/Makefile.am | 2 +
build/win32/vs9/glib-compile-schemas.vcproj | 152 ++
build/win32/vs9/glib.sln | 48 +
build/win32/vs9/glib.vsprops | 5 +
build/win32/vs9/gsettings.vcproj | 152 ++
configure.ac | 8 +-
docs/reference/gio/gio-sections.txt | 3 +
docs/reference/gio/gsettings.xml | 12 +
docs/reference/glib/cross.sgml | 9 +
docs/reference/glib/glib-docs.sgml | 5 +
docs/reference/glib/glib-sections.txt | 19 +-
gio/gactiongroup.c | 4 +-
gio/gapplication.c | 24 +-
gio/gapplicationimpl-dbus.c | 3 +
gio/gdbusaddress.c | 29 +-
gio/gdbusauth.c | 12 +-
gio/gdbusauthmechanismanon.c | 3 +-
gio/gdbusauthmechanismsha1.c | 1 +
gio/gdbusconnection.c | 17 +-
gio/gdbusmessage.c | 7 +-
gio/gdbusprivate.c | 4 +-
gio/gdbusproxy.c | 12 +-
gio/gdbusserver.c | 17 +-
gio/gdesktopappinfo.c | 194 ++-
gio/gdesktopappinfo.h | 3 +
gio/gfileinfo.c | 5 +-
gio/gfilenamecompleter.c | 2 +-
gio/gfilterinputstream.c | 2 +-
gio/ginetaddress.c | 29 +
gio/ginetaddress.h | 3 +
gio/gio.symbols | 3 +
gio/gioenums.h | 9 +-
gio/gioscheduler.c | 3 +-
gio/glib-compile-schemas.c | 9 +-
gio/glocaldirectorymonitor.h | 2 +-
gio/glocalfile.c | 12 +-
gio/glocalfileinfo.c | 8 +-
gio/glocalfileoutputstream.c | 12 +-
gio/gresolver.c | 49 +-
gio/gsettings-tool.c | 72 +-
gio/gsettings.c | 6 +-
gio/gsettingsbackend.c | 23 +-
gio/gsimpleaction.c | 2 +-
gio/gsimpleasyncresult.c | 10 +-
gio/gsocket.c | 30 +-
gio/gsocketclient.c | 22 +-
gio/gsocketconnection.c | 6 +-
gio/gsocketlistener.c | 12 +-
gio/gsocketservice.c | 7 +-
gio/gtcpconnection.c | 2 +-
gio/gthreadedsocketservice.c | 4 +-
gio/gunixconnection.c | 6 +-
gio/gvdb/gvdb-builder.c | 2 +
gio/tests/gapplication-example-cmdline2.c | 16 +-
gio/tests/gapplication.c | 74 +
gio/tests/gdbus-peer.c | 94 +-
gio/tests/gdbus-serialization.c | 42 +-
gio/tests/proxy.c | 2 +-
glib/Makefile.am | 9 +-
glib/gdatetime.c | 5 +-
glib/ghash.c | 24 +-
glib/glib-unix.c | 214 ++
glib/glib-unix.h | 82 +
glib/glib.symbols | 12 +
glib/gmain-internal.h | 35 +
glib/gmain.c | 493 +++-
glib/gmarkup.c | 3 +-
glib/gmessages.c | 15 +-
glib/gregex.c | 2 +-
glib/gsequence.c | 8 +-
glib/gtestutils.c | 81 +-
glib/gtestutils.h | 2 +
glib/gtimezone.c | 45 +-
glib/gtimezone.h | 4 +-
glib/gvariant.c | 2 +-
glib/gvarianttype.h | 2 +
glib/tests/Makefile.am | 7 +
glib/tests/gdatetime.c | 19 +
glib/tests/hash.c | 463 ++--
glib/tests/mappedfile.c | 16 +-
glib/tests/sequence.c | 32 +
glib/tests/unix.c | 141 +
gthread/tests/Makefile.am | 5 +
po/es.po | 680 +++---
po/tr.po | 2809 +++++++++++++-------
94 files changed, 5267 insertions(+), 1785 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
