Merge branch 'master' into open-with-dialog
Conflicts: docs/reference/gtk/gtk3-sections.txt gtk/gtk.symbols
This commit is contained in:
@ -97,6 +97,7 @@
|
||||
<xi:include href="xml/gtklinkbutton.xml" />
|
||||
<xi:include href="xml/gtkscalebutton.xml" />
|
||||
<xi:include href="xml/gtkvolumebutton.xml" />
|
||||
<xi:include href="xml/gtkswitch.xml" />
|
||||
</chapter>
|
||||
|
||||
<chapter id="NumericEntry">
|
||||
@ -287,13 +288,6 @@
|
||||
<xi:include href="xml/gtksocket.xml" />
|
||||
</chapter>
|
||||
|
||||
<chapter id="SpecialObjects">
|
||||
<title>Special-purpose features</title>
|
||||
<xi:include href="xml/gtkruler.xml" />
|
||||
<xi:include href="xml/gtkhruler.xml" />
|
||||
<xi:include href="xml/gtkvruler.xml" />
|
||||
</chapter>
|
||||
|
||||
<chapter id="RecentDocuments">
|
||||
<title>Recently Used Documents</title>
|
||||
<xi:include href="xml/gtkrecentmanager.xml" />
|
||||
|
||||
Reference in New Issue
Block a user