Merge branch 'v0.18.x'

This commit is contained in:
Max Kellermann
2014-07-09 20:02:07 +02:00
8 changed files with 54 additions and 46 deletions

View File

@@ -31,6 +31,7 @@
#include <glib.h>
#include <string>
#include <stdio.h>
#include <stdio.h>