Matthias Clasen db76c77b81 Merge branch 'native-layout-incubator' ...

Conflicts:
	configure.in
	docs/reference/gtk/tmpl/gtkaction.sgml
	docs/reference/gtk/tmpl/gtkbuilder.sgml
	gdk/directfb/gdkkeys-directfb.c
	gdk/gdk.symbols
	gdk/x11/gdkwindow-x11.c
	gtk/gtkalignment.c
	gtk/gtkbox.c
	gtk/gtkbutton.c
	gtk/gtkcelleditable.c
	gtk/gtkfilechooser.c
	gtk/gtkframe.c
	gtk/gtkinvisible.c
	gtk/gtklabel.c
	gtk/gtkscrolledwindow.c
	gtk/gtksearchenginetracker.c
	gtk/gtktextview.c
	gtk/gtktoolbutton.c
	gtk/gtktooltip.c
	gtk/gtkviewport.c
	gtk/gtkwidget.c
	gtk/gtkwindow.c
	po-properties/ca@valencia.po
	po-properties/es.po
	po-properties/kn.po
	po-properties/mr.po
	po/ca.po
	po/ca@valencia.po
	po/el.po
	po/es.po
	po/gl.po
	po/id.po
	po/kn.po
	po/lv.po
	po/mr.po
	po/th.po

2010-04-30 17:56:50 -04:00

..

images

Fix up docs, and set up the aliasing machinery

2009-11-26 23:52:20 -05:00

tmpl

Merge branch 'native-layout-incubator'

2010-04-30 17:56:50 -04:00

building.sgml

Add notes about gobject-introspection

2010-04-03 20:59:23 -04:00

changes-1.2.sgml

Bug 540967 – docs build slowly because of entities

2008-07-10 03:27:56 +00:00

changes-2.0.sgml

Bug 540967 – docs build slowly because of entities

2008-07-10 03:27:56 +00:00

compiling.sgml

Add info about single includes when compiling GTK+ apps

2010-04-03 20:51:49 -04:00

directfb.sgml

Bug 540967 – docs build slowly because of entities

2008-07-10 03:27:56 +00:00

drawing-model.xml

Don't use GTK_WIDGET_*SET_FLAGS (wid, GTK_DOUBLE_BUFFERED)

2010-04-03 20:58:21 -04:00

glossary.xml

Deprecate flag macros for toplevel, state, no window and composite child

2010-04-03 20:55:07 -04:00

gtk-builder-convert.xml

Updates

2007-07-10 05:28:52 +00:00

gtk-docs.sgml

[docs] Fix GtkOffscreenWindow documentation

2010-04-03 20:55:27 -04:00

gtk-overrides.txt

…

gtk-query-immodules-2.0.xml

Bug 540967 – docs build slowly because of entities

2008-07-10 03:27:56 +00:00

gtk-sections.txt

Add a way to set symbolic colors per-widget

2010-04-29 17:01:25 -04:00

gtk-update-icon-cache.xml

Bug 540967 – docs build slowly because of entities

2008-07-10 03:27:56 +00:00

gtk.types

[docs] Fix GtkOffscreenWindow documentation

2010-04-03 20:55:27 -04:00

Makefile.am

Merge branch 'master' into toolpalette

2009-10-28 10:57:46 +01:00

migrating-checklist.sgml

Bug 540967 – docs build slowly because of entities

2008-07-10 03:27:56 +00:00

migrating-ClientSideWindows.sgml

Mention thread-safety issues

2009-09-13 23:32:46 -04:00

migrating-GtkAboutDialog.sgml

Bug 540967 – docs build slowly because of entities

2008-07-10 03:27:56 +00:00

migrating-GtkAction.sgml

Bug 540967 – docs build slowly because of entities

2008-07-10 03:27:56 +00:00

migrating-GtkAssistant.sgml

Bug 540967 – docs build slowly because of entities

2008-07-10 03:27:56 +00:00

migrating-GtkBuilder.sgml

Correct a thinko

2009-07-30 09:13:23 -04:00

migrating-GtkColorButton.sgml

Bug 540967 – docs build slowly because of entities

2008-07-10 03:27:56 +00:00

migrating-GtkComboBox.sgml

Fix links in GtkComboBox migration guide

2010-04-03 20:55:11 -04:00

migrating-GtkEntry-icons.sgml

Fix a typo

2009-08-06 23:49:02 -04:00

migrating-GtkFileChooser.sgml

Bug 540967 – docs build slowly because of entities

2008-07-10 03:27:56 +00:00

migrating-GtkIconView.sgml

docs: don't invent new docbook tags, it is <type> not <typename>

2009-07-31 13:27:48 +03:00

migrating-GtkLabel-links.sgml

Add a separate keybinding signal for activating links

2009-05-11 02:44:12 -04:00

migrating-GtkLinkButton.sgml

Mention default hook

2008-12-27 05:37:10 +00:00

migrating-GtkRecentChooser.sgml

Bug 540967 – docs build slowly because of entities

2008-07-10 03:27:56 +00:00

migrating-GtkTooltip.sgml

Bug 540967 – docs build slowly because of entities

2008-07-10 03:27:56 +00:00

objects_grouped.sgml

…

osx.sgml

Bug 540967 – docs build slowly because of entities

2008-07-10 03:27:56 +00:00

other_software.sgml

Bug 540967 – docs build slowly because of entities

2008-07-10 03:27:56 +00:00

question_index.sgml

trivial fixes

2008-12-26 04:42:25 +00:00

resources.sgml

Bug 540967 – docs build slowly because of entities

2008-07-10 03:27:56 +00:00

running.sgml

Update debug flag information

2009-11-27 00:32:14 -05:00

text_widget.sgml

Bug 540967 – docs build slowly because of entities

2008-07-10 03:27:56 +00:00

tree_widget.sgml

Bug 540967 – docs build slowly because of entities

2008-07-10 03:27:56 +00:00

version.xml.in

…

visual_index.xml

Merge branch 'master' into toolpalette

2009-10-28 10:57:46 +01:00

windows.sgml

Bug 540967 – docs build slowly because of entities

2008-07-10 03:27:56 +00:00

x11.sgml

Bug 540967 – docs build slowly because of entities

2008-07-10 03:27:56 +00:00