[Pkg-cli-apps-commits] [docky] 01/02: Merge tag 'upstream/2.2.1.1'

[Rico Tzschichholz]

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

ricotz-guest pushed a commit to branch master
in repository docky.

commit 8191a1eada106b10c5ba65e88d4c67976de68400
Merge: 9da22df 2e31df0
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Wed Sep 2 19:24:02 2015 +0200

    Merge tag 'upstream/2.2.1.1'
    
    Upstream version 2.2.1.1

 Docky.CairoHelper/Makefile.in                      |  1 +
 Docky.DBus/Makefile.in                             |  1 +
 Docky.Items/Makefile.in                            |  1 +
 Docky.Services/AssemblyInfo.cs                     |  4 +-
 Docky.Services/Makefile.in                         |  1 +
 Docky.Widgets/Makefile.in                          |  1 +
 Docky/AssemblyInfo.cs                              |  6 +-
 Docky/Makefile.in                                  |  1 +
 Makefile.am                                        |  5 ++
 Makefile.in                                        | 84 +++++++++++++++++++---
 StandardPlugins/BatteryMonitor/Makefile.in         |  1 +
 StandardPlugins/Bookmarks/Makefile.in              |  1 +
 StandardPlugins/CPUMonitor/Makefile.in             |  1 +
 StandardPlugins/Clippy/Makefile.in                 |  1 +
 StandardPlugins/Clock/Makefile.in                  |  1 +
 StandardPlugins/Clock/Themes/Default/Makefile.in   |  1 +
 StandardPlugins/Clock/Themes/Default24/Makefile.in |  1 +
 StandardPlugins/Clock/Themes/Makefile.in           |  1 +
 StandardPlugins/Desktop/Makefile.in                |  1 +
 StandardPlugins/GMail/Makefile.in                  |  1 +
 StandardPlugins/Makefile.in                        |  1 +
 StandardPlugins/Mounter/Makefile.in                |  1 +
 StandardPlugins/NPR/Makefile.in                    |  1 +
 StandardPlugins/NetworkManager/Makefile.in         |  1 +
 StandardPlugins/NetworkMonitor/Makefile.in         |  1 +
 StandardPlugins/RecentDocuments/Makefile.in        |  1 +
 StandardPlugins/SessionManager/Makefile.in         |  1 +
 StandardPlugins/Timer/Makefile.in                  |  1 +
 StandardPlugins/Trash/Makefile.in                  |  1 +
 StandardPlugins/Weather/Makefile.in                |  1 +
 StandardPlugins/WorkspaceSwitcher/Makefile.in      |  1 +
 configure                                          | 31 +++++---
 configure.ac                                       | 12 +++-
 data/Makefile.in                                   |  1 +
 data/icons/Makefile.in                             |  1 +
 data/icons/hicolor/128x128/Makefile.in             |  1 +
 data/icons/hicolor/128x128/apps/Makefile.in        |  1 +
 data/icons/hicolor/16x16/Makefile.in               |  1 +
 data/icons/hicolor/16x16/apps/Makefile.in          |  1 +
 data/icons/hicolor/22x22/Makefile.in               |  1 +
 data/icons/hicolor/22x22/apps/Makefile.in          |  1 +
 data/icons/hicolor/24x24/Makefile.in               |  1 +
 data/icons/hicolor/24x24/apps/Makefile.in          |  1 +
 data/icons/hicolor/32x32/Makefile.in               |  1 +
 data/icons/hicolor/32x32/apps/Makefile.in          |  1 +
 data/icons/hicolor/48x48/Makefile.in               |  1 +
 data/icons/hicolor/48x48/apps/Makefile.in          |  1 +
 data/icons/hicolor/48x48/mimetypes/Makefile.in     |  1 +
 data/icons/hicolor/64x64/Makefile.in               |  1 +
 data/icons/hicolor/64x64/apps/Makefile.in          |  1 +
 data/icons/hicolor/Makefile.in                     |  1 +
 data/themes/Air/Makefile.in                        |  1 +
 data/themes/Glass/Makefile.in                      |  1 +
 data/themes/Grayscale/Makefile.in                  |  1 +
 data/themes/HUD/Makefile.in                        |  1 +
 data/themes/Makefile.in                            |  1 +
 data/themes/Matte/Makefile.in                      |  1 +
 data/themes/Smoke/Makefile.in                      |  1 +
 data/themes/Transparent/Makefile.in                |  1 +
 lib/Makefile.in                                    |  1 +
 lib/wnck-sharp1/Makefile.in                        |  1 +
 m4/Makefile.in                                     |  1 +
 man/Makefile.in                                    |  1 +
 63 files changed, 172 insertions(+), 27 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/docky.git