Merge branch 'gdbus-merge'

Conflicts:
	docs/reference/gio/gio-docs.xml
	docs/reference/gio/gio-sections.txt
	gio/tests/Makefile.am
This commit is contained in:
Matthias Clasen
2010-05-13 23:08:34 -04:00
95 changed files with 39802 additions and 44 deletions

View File

@@ -365,6 +365,30 @@ Flags which influence the parsing.
@Returns:
<!-- ##### FUNCTION g_key_file_get_int64 ##### -->
<para>
</para>
@key_file:
@group_name:
@key:
@error:
@Returns:
<!-- ##### FUNCTION g_key_file_get_uint64 ##### -->
<para>
</para>
@key_file:
@group_name:
@key:
@error:
@Returns:
<!-- ##### FUNCTION g_key_file_get_double ##### -->
<para>
@@ -511,6 +535,28 @@ Flags which influence the parsing.
@value:
<!-- ##### FUNCTION g_key_file_set_int64 ##### -->
<para>
</para>
@key_file:
@group_name:
@key:
@value:
<!-- ##### FUNCTION g_key_file_set_uint64 ##### -->
<para>
</para>
@key_file:
@group_name:
@key:
@value:
<!-- ##### FUNCTION g_key_file_set_double ##### -->
<para>