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

@@ -44,6 +44,7 @@
#include <errno.h>
#include "gunixfdmessage.h"
#include "gunixfdlist.h"
#include "gioerror.h"
#include "gioalias.h"