[Xfce4-commits] [apps/xfce4-taskmanager] 04/06: Merge remote-tracking branch 'ochosi/fix_gtk3'

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

landry pushed a commit to branch master
in repository apps/xfce4-taskmanager.

commit 6233f9f13823c623f2c542a582c597904c8fba68
Merge: 92bbd58 e8c8dff
Author: Landry Breuil <landry at xfce.org>
Date:   Wed Dec 17 20:49:45 2014 +0100

    Merge remote-tracking branch 'ochosi/fix_gtk3'

 configure.ac.in                                    |   24 ++-
 src/Makefile.am                                    |   24 ++-
 src/exec-tool-button.c                             |   20 ++-
 src/main.c                                         |    4 +
 src/process-monitor.c                              |  182 +++++---------------
 src/process-monitor.h                              |    2 -
 src/process-statusbar.c                            |    4 +
 src/process-tree-view.c                            |    3 +-
 src/process-window-gtk3.ui                         |  161 +++++++++++++++++
 src/process-window.c                               |   22 ++-
 ...{settings-dialog.ui => settings-dialog-gtk3.ui} |  143 +++++++++------
 src/settings-dialog.c                              |   17 +-
 src/settings-dialog.ui                             |   21 +--
 src/settings-tool-button.c                         |    4 +-
 14 files changed, 390 insertions(+), 241 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.