Merge branch 'v0.15.x' into v0.16.x

Conflicts:
	NEWS
	configure.ac
	src/directory.h
This commit is contained in:
Max Kellermann
2011-01-07 23:50:23 +01:00
6 changed files with 25 additions and 10 deletions
+3
View File
@@ -29,6 +29,9 @@
#include <assert.h>
#include <string.h>
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "httpd_output"
struct httpd_client {
/**
* The httpd output object this client is connected to.