[Xfce4-commits] [xfce/xfce4-settings] 05/05: Merge remote-tracking branch 'schuellerf/mirrored-cloned-inconsistent-4.12' into xfce-4.12

[noreply at xfce.org]

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

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       x   f   c   e   -   4   .   1   2   
   in repository xfce/xfce4-settings.

commit 8441a949aadc6e2ef4fec011856c5aefb259eff3
Merge: db0fcec 34396b2
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sun Mar 11 08:07:56 2018 -0400

    Merge remote-tracking branch 'schuellerf/mirrored-cloned-inconsistent-4.12' into xfce-4.12

 dialogs/display-settings/main.c | 150 ++++++++++++++++++++++++++++------------
 1 file changed, 104 insertions(+), 46 deletions(-)

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