AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix conflict Git markers

Browse Source 
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=619655
This commit is contained in:
Bruce Cowan 2010-05-25 20:27:43 +01:00 committed by Javier Jardón
parent 0c6565e1d3
commit a538f639b6
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkfilechooser.c
View File

@ -504,11 +504,7 @@
* </listitem> * </listitem>
* </varlistentry> * </varlistentry>
* <varlistentry> * <varlistentry>
<<<<<<< HEAD
* <term><parameter>bookmark_indes</parameter>&nbsp;:</term> * <term><parameter>bookmark_indes</parameter>&nbsp;:</term>
=======
* <term><parameter>bookmark_index</parameter>&nbsp;:</term>
>>>>>>> native-layout-incubator
* <listitem> * <listitem>
* <simpara> * <simpara>
* index of the bookmark to switch to; the indices start at 0. * index of the bookmark to switch to; the indices start at 0.

6
gtk/gtkscrolledwindow.c
View File

@ -397,15 +397,9 @@ gtk_scrolled_window_init (GtkScrolledWindow *scrolled_window)
* gtk_scrolled_window_new: * gtk_scrolled_window_new:
* @hadjustment: (allow-none): horizontal adjustment * @hadjustment: (allow-none): horizontal adjustment
* @vadjustment: (allow-none): vertical adjustment * @vadjustment: (allow-none): vertical adjustment
<<<<<<< HEAD
* *
* Creates a new scrolled window. * Creates a new scrolled window.
* *
=======
*
* Creates a new scrolled window.
*
>>>>>>> native-layout-incubator
* The two arguments are the scrolled window's adjustments; these will be * The two arguments are the scrolled window's adjustments; these will be
* shared with the scrollbars and the child widget to keep the bars in sync * shared with the scrollbars and the child widget to keep the bars in sync
* with the child. Usually you want to pass %NULL for the adjustments, which * with the child. Usually you want to pass %NULL for the adjustments, which