Merge branch 'master', remote branch 'origin'

This commit is contained in:
Daiki Ueno
2010-06-07 06:48:37 +09:00

View File

@ -30,6 +30,12 @@
<title>XKB layout engine</title> <title>XKB layout engine</title>
<xi:include href="xml/eek-xkb-layout.xml"/> <xi:include href="xml/eek-xkb-layout.xml"/>
</chapter> </chapter>
<chapter>
<title>GTK keyboard elements</title>
<xi:include href="xml/eek-gtk-keyboard.xml"/>
<xi:include href="xml/eek-gtk-section.xml"/>
<xi:include href="xml/eek-gtk-key.xml"/>
</chapter>
<chapter id="object-tree"> <chapter id="object-tree">
<title>Object Hierarchy</title> <title>Object Hierarchy</title>
<xi:include href="xml/tree_index.sgml"/> <xi:include href="xml/tree_index.sgml"/>