Merge branch 'master' into native-layoutnative-layout

Conflicts:
	gtk/gtkplug.c
	gtk/gtkscrolledwindow.c

1 files changed, 0 insertions, 44 deletions

diff --git a/docs/reference/gtk/directfb.sgml b/docs/reference/gtk/directfb.sgml
deleted file mode 100644
index 4137b30f1d..0000000000
--- a/docs/reference/gtk/directfb.sgml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<refentry id="gtk-directfb">
-<refmeta>
-<refentrytitle>Using GTK+ on DirectFB</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>GTK Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>Using GTK+ on DirectFB</refname>
-<refpurpose>
-DirectFB-specific aspects of using GTK+
-</refpurpose>
-</refnamediv>
-
-<refsect1>
-<title>Using GTK+ on DirectFB</title>
-
-<para>
-The DirectFB port of GTK+ is an implementation of GDK (and therefore GTK+) 
-on top of the <ulink url="http://www.directfb.org">DirectFB</ulink> 
-libraries.
-</para>
-
-<para>
-Like the obsolete linux-fb port of GTK+, it runs on the Linux framebuffer,
-but the DirectFB libraries provide additional features like hardware graphics 
-acceleration, input device handling and abstraction and an integrated windowing 
-system.
-</para>
-
-<refsect2><title>Build requirements</title>
-
-<para>
-Beyond the usual GTK+ build requirements, the DirectFB backend (obviously) 
-needs the DirectFB libraries (at least 0.9.21) and cairo compiled with 
-DirectFB support.
-</para>
-</refsect2>
-</refsect1>
-</refentry>