diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-12-03 03:12:16 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-12-03 03:12:16 +0000 |
| commit | 838256e1605b308b76bbf9bc884384fbdd666324 (patch) | |
| tree | 0ffc5b9fadc466bf53658ddea233622693fc56b4 /docs | |
| parent | 1f9aefbd2e5031aecc6f81dc8e53ba0a270f6cd6 (diff) | |
| download | gtk+-838256e1605b308b76bbf9bc884384fbdd666324.tar.gz | |
=== Released GTK+-2.1.3 ===GTK_2_1_3
Mon Dec 2 20:36:28 2002 Owen Taylor <otaylor@redhat.com>
* === Released GTK+-2.1.3 ===
* configure.in: Version 2.1.3, interface ago 0.
* NEWS: Update
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/reference/gtk/tmpl/gtksocket.sgml | 8 | ||||
| -rw-r--r-- | docs/reference/gtk/tmpl/gtktreestore.sgml | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/docs/reference/gtk/tmpl/gtksocket.sgml b/docs/reference/gtk/tmpl/gtksocket.sgml index c887119982..e870c989a3 100644 --- a/docs/reference/gtk/tmpl/gtksocket.sgml +++ b/docs/reference/gtk/tmpl/gtksocket.sgml @@ -140,17 +140,17 @@ never be set by an application.) </para> -@socket_: the object which received the signal. -<!-- # Unused Parameters # --> @socket: the object which received the signal. +<!-- # Unused Parameters # --> +@socket_: the object which received the signal. <!-- ##### SIGNAL GtkSocket::plug-removed ##### --> <para> </para> -@socket_: the object which received the signal. +@socket: the object which received the signal. @Returns: <!-- # Unused Parameters # --> -@socket: the object which received the signal. +@socket_: the object which received the signal. diff --git a/docs/reference/gtk/tmpl/gtktreestore.sgml b/docs/reference/gtk/tmpl/gtktreestore.sgml index 39832d3b93..d53f2a95d8 100644 --- a/docs/reference/gtk/tmpl/gtktreestore.sgml +++ b/docs/reference/gtk/tmpl/gtktreestore.sgml @@ -209,6 +209,10 @@ drop</link> interfaces. @b: +<<<<<<< gtktreestore.sgml +======= + + <!-- ##### FUNCTION gtk_tree_store_move_before ##### --> <para> @@ -229,3 +233,6 @@ drop</link> interfaces. @position: +>>>>>>> 1.16 + + |