• Ramon Buldó's avatar
    Merge remote-tracking branch 'upstream/master' · 9ceeafcd
    Ramon Buldó authored
    # Conflicts:
    #	Breeze-gtk/CMakeLists.txt
    #	Breeze-gtk/gtk-2.0/Buttons/button-prelight.png
    #	Breeze-gtk/gtk-2.0/Buttons/button-pressed.png
    #	Breeze-gtk/gtk-2.0/Check-Radio/checkbox-checked.png
    #	Breeze-gtk/gtk-2.0/Check-Radio/menu-checkbox-checked.png
    #	Breeze-gtk/gtk-2.0/Check-Radio/menu-option-checked.png
    #	Breeze-gtk/gtk-2.0/Check-Radio/option-checked.png
    #	Breeze-gtk/gtk-2.0/Entry/entry-border-active-bg.png
    #	Breeze-gtk/gtk-2.0/Menubar/menubar-button.png
    #	Breeze-gtk/gtk-2.0/ProgressBar/bar.png
    #	Breeze-gtk/gtk-2.0/Range/slider-horiz-prelight.png
    #	Breeze-gtk/gtk-2.0/Range/slider-vert-prelight.png
    #	Breeze-gtk/gtk-2.0/Scrollbars/slider-scrollbar-horiz-active.png
    #	Breeze-gtk/gtk-2.0/Scrollbars/slider-scrollbar-horiz-prelight.png
    #	Breeze-gtk/gtk-2.0/Scrollbars/slider-scrollbar-vert-active.png
    #	Breeze-gtk/gtk-2.0/Scrollbars/slider-scrollbar-vert-prelight.png
    #	Breeze-gtk/gtk-2.0/Toolbar/toolbutton-prelight.png
    #	Breeze-gtk/gtk-2.0/Toolbar/toolbutton-presse...
    9ceeafcd