[Pkg-mpd-commits] [qmpdclient] 26/38: Merge tag 'upstream/1.2.2+git20151118'

[Andrey Rahmatullin]

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

wrar pushed a commit to branch master
in repository qmpdclient.

commit 67af4fd36c389be350d26e4615f5f3f3eb1347f1
Merge: fd950c9 b848641
Author: Andrey Rakhmatullin <wrar at wrar.name>
Date:   Sat May 21 19:26:16 2016 +0500

    Merge tag 'upstream/1.2.2+git20151118'
    
    Upstream git snapshot for 2015-11-18

 .gitignore                 |   1 +
 CMakeLists.txt             |  13 ++-
 README                     |   3 +-
 icons/64x64/qmpdclient.png | Bin 2247 -> 2142 bytes
 icons/qmpdclient.ico       | Bin 1150 -> 15086 bytes
 lang/fr_FR.ts              | 110 +++++++++++++-------------
 src/config.cpp             |   9 ++-
 src/config.h               |   1 +
 src/controlpanel.cpp       |  35 ++++++++-
 src/controlpanel.h         |   4 +-
 src/lastfmsubmitter.cpp    |  10 ++-
 src/libmpdclient.c         |  13 ++-
 src/libmpdclient.h         |   4 +-
 src/lyricsdialog.cpp       |   2 +-
 src/mainwindow.cpp         |   8 +-
 src/mainwindow.h           |   2 +
 src/mpdsong.h              |   5 ++
 src/mpdstatus.cpp          |   2 +-
 src/playlistpanel.cpp      |   3 +-
 src/playlistpanel.h        |   2 +-
 src/playlistview.cpp       |   5 ++
 src/playlistview.h         |   2 +-
 src/stringlistview.cpp     |   4 +-
 ui/controlpanel.ui         | 191 ++++++++++++++++++++++-----------------------
 24 files changed, 252 insertions(+), 177 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mpd/qmpdclient.git