diff options
author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-12-02 13:58:02 +0900 |
---|---|---|
committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-12-02 13:58:02 +0900 |
commit | 03a72118add37e6df51c12dba6c62298e810d41a (patch) | |
tree | 200a88ad09d55a5e0a207d0f7275de146e8b337c /gtk/gtk.h | |
parent | a9fd00a4358f0ff73280bfeb51164872aea50e9b (diff) | |
parent | dd678ac323b81e67bb1dea488f2123efee7e3500 (diff) | |
download | gtk+-03a72118add37e6df51c12dba6c62298e810d41a.tar.gz |
Merge branch 'master' into treeview-refactor
Conflicts:
tests/Makefile.am
Diffstat (limited to 'gtk/gtk.h')
-rw-r--r-- | gtk/gtk.h | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -40,6 +40,10 @@ #include <gtk/gtkactivatable.h> #include <gtk/gtkadjustment.h> #include <gtk/gtkalignment.h> +#include <gtk/gtkappchooser.h> +#include <gtk/gtkappchooserdialog.h> +#include <gtk/gtkappchooserwidget.h> +#include <gtk/gtkappchooserbutton.h> #include <gtk/gtkapplication.h> #include <gtk/gtkarrow.h> #include <gtk/gtkaspectframe.h> @@ -174,6 +178,7 @@ #include <gtk/gtkstatusicon.h> #include <gtk/gtkstock.h> #include <gtk/gtkstyle.h> +#include <gtk/gtkswitch.h> #include <gtk/gtktable.h> #include <gtk/gtktearoffmenuitem.h> #include <gtk/gtktextbuffer.h> |