[Xfce4-commits] [www/www.xfce.org] 01/01: Merge remote-tracking branch 'origin/xfce-4.12'

[noreply at xfce.org]

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

nick pushed a commit to branch master
in repository www/www.xfce.org.

commit 33a3ebfea537934451cd6780946351bc7021c230
Merge: 07931ed c723d48
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Feb 28 21:10:51 2015 +0100

    Merge remote-tracking branch 'origin/xfce-4.12'

 pages/about/credits.php                            |   29 +-
 pages/about/nav.php                                |    3 +-
 pages/about/screenshots.php                        |    5 +
 pages/about/tour.php                               |  147 +--
 pages/about/{tour.php => tour410.php}              |    0
 pages/download/changelogs/4.12.php                 |  978 ++++++++++++++++++++
 pages/download/changelogs/index.php                |    1 +
 pages/frontpage.php                                |    2 +-
 pages/news-array.php                               |   61 ++
 pages/versions.php                                 |    4 +-
 static/about/screenshots/4.12-1-small.jpg          |  Bin 0 -> 10520 bytes
 static/about/screenshots/4.12-1.png                |  Bin 0 -> 453216 bytes
 static/about/screenshots/4.12-2-small.jpg          |  Bin 0 -> 7051 bytes
 static/about/screenshots/4.12-2.png                |  Bin 0 -> 286663 bytes
 static/about/screenshots/4.12-3-small.jpg          |  Bin 0 -> 11982 bytes
 static/about/screenshots/4.12-3.png                |  Bin 0 -> 221629 bytes
 static/about/tour/4.12/mousepad-prefs.png          |  Bin 0 -> 36161 bytes
 static/about/tour/4.12/panel-hidden.png            |  Bin 0 -> 6813 bytes
 static/about/tour/4.12/panel-shown-stack.png       |  Bin 0 -> 18301 bytes
 static/about/tour/4.12/panel-shown.png             |  Bin 0 -> 19850 bytes
 static/about/tour/4.12/parole-audio.png            |  Bin 0 -> 148633 bytes
 static/about/tour/4.12/parole.png                  |  Bin 0 -> 120177 bytes
 static/about/tour/4.12/tabwin-list-crop.png        |  Bin 0 -> 35058 bytes
 static/about/tour/4.12/tabwin-preview-crop.png     |  Bin 0 -> 129001 bytes
 static/about/tour/4.12/tabwin-simple-crop.png      |  Bin 0 -> 31357 bytes
 static/about/tour/4.12/taskman-filter.png          |  Bin 0 -> 56803 bytes
 static/about/tour/4.12/taskman-tree.png            |  Bin 0 -> 64720 bytes
 static/about/tour/4.12/thunar-freespace.png        |  Bin 0 -> 23359 bytes
 static/about/tour/4.12/thunar-multifiles-props.png |  Bin 0 -> 19240 bytes
 static/about/tour/4.12/thunar-tabs.png             |  Bin 0 -> 30092 bytes
 static/about/tour/4.12/whiskermenu-default.png     |  Bin 0 -> 43217 bytes
 static/about/tour/4.12/whiskermenu-search.png      |  Bin 0 -> 36161 bytes
 .../tour/4.12/xfce4-appearance-settings-icons.png  |  Bin 0 -> 39071 bytes
 .../tour/4.12/xfce4-appearance-settings-style.png  |  Bin 0 -> 21936 bytes
 static/about/tour/4.12/xfce4-display-layout.png    |  Bin 0 -> 36160 bytes
 .../tour/4.12/xfce4-display-settings-laptop.png    |  Bin 0 -> 43772 bytes
 .../4.12/xfce4-display-settings-twoscreens.png     |  Bin 0 -> 49474 bytes
 static/about/tour/4.12/xfce4-display-settings.png  |  Bin 0 -> 54171 bytes
 .../tour/4.12/xfdesktop-properties-multiscreen.png |  Bin 0 -> 198847 bytes
 .../4.12/xfdesktop-properties-multiworkspace.png   |  Bin 0 -> 64046 bytes
 static/about/tour/4.12/xfpm-plugin-crop.png        |  Bin 0 -> 10431 bytes
 static/about/tour/4.12/xfpm-prefs-devices.png      |  Bin 0 -> 37003 bytes
 static/about/tour/4.12/xfpm-prefs-display.png      |  Bin 0 -> 35458 bytes
 static/about/tour/4.12/xfpm-prefs-general.png      |  Bin 0 -> 34268 bytes
 static/about/tour/4.12/xfpm-prefs-security.png     |  Bin 0 -> 41780 bytes
 static/about/tour/4.12/xfpm-prefs-system.png       |  Bin 0 -> 35315 bytes
 static/about/tour/4.12/xfwm4-csd.png               |  Bin 0 -> 29303 bytes
 static/about/tour/4.12/xfwm4-tiling-small.png      |  Bin 0 -> 119000 bytes
 48 files changed, 1160 insertions(+), 70 deletions(-)

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