[glade3/signal-tree-model: 35/38] Merge branch 'master' into signal-tree-model
- From: Johannes Schmid <jhs src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade3/signal-tree-model: 35/38] Merge branch 'master' into signal-tree-model
- Date: Sun, 9 Jan 2011 11:54:43 +0000 (UTC)
commit 8a7046af72fcf7b58111abdc1d2f560c12af38fd
Merge: 148255f 5233085
Author: Johannes Schmid <jhs gnome org>
Date: Sun Jan 9 11:30:29 2011 +0100
Merge branch 'master' into signal-tree-model
ChangeLog | 108 +
configure.ac | 3 +-
data/glade.desktop.in.in | 2 +-
gladeui/glade-builtins.c | 28 +-
gladeui/glade-command.c | 27 +-
gladeui/glade-command.h | 9 +-
gladeui/glade-design-layout.c | 37 +-
gladeui/glade-editable.c | 101 +-
gladeui/glade-editable.h | 4 +
gladeui/glade-editor-property.c | 10 +-
gladeui/glade-editor.c | 8 +-
gladeui/glade-inspector.c | 22 +-
gladeui/glade-placeholder.c | 2 -
gladeui/glade-popup.c | 10 +-
gladeui/glade-project.c | 29 +-
gladeui/glade-utils.c | 332 +---
gladeui/glade-utils.h | 186 +-
gladeui/glade-widget-adaptor.c | 2 +-
gladeui/glade-widget.c | 9 +-
plugins/gtk+/Makefile.am | 6 +-
plugins/gtk+/glade-activatable-editor.c | 63 +-
plugins/gtk+/glade-activatable-editor.h | 1 -
plugins/gtk+/glade-button-editor.c | 72 +-
plugins/gtk+/glade-button-editor.h | 1 -
plugins/gtk+/glade-column-types.c | 7 +-
plugins/gtk+/glade-entry-editor.c | 86 +-
plugins/gtk+/glade-entry-editor.h | 1 -
plugins/gtk+/glade-gtk.c | 641 ++++-
plugins/gtk+/glade-icon-factory-editor.c | 51 +-
plugins/gtk+/glade-image-editor.c | 66 +-
plugins/gtk+/glade-image-editor.h | 1 -
plugins/gtk+/glade-image-item-editor.c | 61 +-
plugins/gtk+/glade-image-item-editor.h | 1 -
plugins/gtk+/glade-label-editor.c | 87 +-
plugins/gtk+/glade-label-editor.h | 1 -
plugins/gtk+/glade-model-data.c | 130 +-
plugins/gtk+/glade-store-editor.c | 52 +-
plugins/gtk+/glade-tool-button-editor.c | 75 +-
plugins/gtk+/glade-tool-button-editor.h | 1 -
plugins/gtk+/glade-tool-item-group-editor.c | 290 ++
plugins/gtk+/glade-tool-item-group-editor.h | 65 +
plugins/gtk+/glade-treeview-editor.c | 54 +-
plugins/gtk+/gtk+.xml.in | 269 ++-
po/gl.po | 3918 ++++++++++++++-------------
src/glade-window.c | 6 +-
45 files changed, 3728 insertions(+), 3207 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]