diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-08-30 14:56:28 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-08-30 14:56:28 +0900 |
| commit | 54d44a9bd04cfbed8426614fc69c027a46f41a14 (patch) | |
| tree | 34bdf65a6e8d5d6d4016154345d1d803ba0da379 /docs/reference/gdk | |
| parent | b3b22c31b997fb85b3319b392a1a69407703184c (diff) | |
| parent | 67194ed77b153eb5a7eb6c596f3c20e274b7787a (diff) | |
| download | gtk+-native-layout.tar.gz | |
Merge branch 'master' into native-layoutnative-layout
Conflicts:
gtk/gtkplug.c
gtk/gtkscrolledwindow.c
Diffstat (limited to 'docs/reference/gdk')
| -rw-r--r-- | docs/reference/gdk/Makefile.am | 1 | ||||
| -rw-r--r-- | docs/reference/gdk/gdk3-sections.txt | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am index d726ac227b..3015baa9fa 100644 --- a/docs/reference/gdk/Makefile.am +++ b/docs/reference/gdk/Makefile.am @@ -29,7 +29,6 @@ IGNORE_HFILES= \ gdkpoly-generic.h \ keyname-table.h \ win32 \ - directfb \ x11 \ quartz diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt index 9f6a878cea..fe5d5de524 100644 --- a/docs/reference/gdk/gdk3-sections.txt +++ b/docs/reference/gdk/gdk3-sections.txt @@ -52,7 +52,6 @@ gdk_error_trap_pop GDK_WINDOWING_X11 GDK_WINDOWING_WIN32 GDK_WINDOWING_QUARTZ -GDK_WINDOWING_DIRECTFB <SUBSECTION Standard> GDK_TYPE_GRAB_STATUS |