Merge branch 'master' into dbus-work

This commit is contained in:
Tanu Kaskinen 2009-06-29 18:55:12 +03:00
commit c266595058
12 changed files with 155 additions and 86 deletions

View file

@ -24,6 +24,10 @@
#include <config.h>
#endif
#ifndef OS_IS_WIN32
#include <pthread.h>
#endif
#include <signal.h>
#include <stdio.h>