[gtk: 21/21] Merge branch 'matthiasc/for-master' into 'master'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 21/21] Merge branch 'matthiasc/for-master' into 'master'
- Date: Sat, 18 Jul 2020 17:31:38 +0000 (UTC)
commit 9b64635925980e641312b3d9386ac9107cef5922
Merge: 4da3edd42e 7b76be5360
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Jul 18 17:31:31 2020 +0000
Merge branch 'matthiasc/for-master' into 'master'
Matthiasc/for master
See merge request GNOME/gtk!2264
gtk/gtkbutton.c | 11 ++
gtk/gtkeditablelabel.c | 34 ++++
gtk/gtktext.c | 8 +-
gtk/inspector/action-editor.c | 152 +++++++++--------
gtk/inspector/action-editor.h | 19 +--
gtk/inspector/actions.c | 85 ++++++----
gtk/inspector/actions.h | 19 +--
gtk/inspector/actions.ui | 3 +-
gtk/inspector/general.c | 274 ++++++++++++++++---------------
gtk/inspector/general.h | 20 +--
gtk/inspector/list-data.c | 10 +-
gtk/inspector/logs.c | 150 +++++++++--------
gtk/inspector/logs.h | 18 +-
gtk/inspector/logs.ui | 2 +-
gtk/inspector/misc-info.c | 321 ++++++++++++++++++------------------
gtk/inspector/misc-info.h | 17 +-
gtk/inspector/prop-editor.c | 4 +
gtk/inspector/recorder.c | 121 +++++++-------
gtk/inspector/recorder.h | 16 +-
gtk/inspector/recorder.ui | 2 +-
gtk/inspector/shortcuts.c | 14 ++
gtk/inspector/tree-data.c | 15 ++
gtk/inspector/visual.c | 370 +++++++++++++++++++++---------------------
gtk/inspector/visual.h | 19 +--
gtk/inspector/window.c | 3 +-
25 files changed, 869 insertions(+), 838 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]