[playonlinux] 28/230: Merge tag upstream/3.4

[Bertrand Marc]

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

bmarc pushed a commit to branch master
in repository playonlinux.

commit d13b10efca77a310c0d2dc0e83b95bca9692c299
Merge: f740bbf d5cab7b
Author: Bertrand Marc <bmarc at debian.org>
Date:   Sun Jul 9 18:50:40 2017 +0200

    Merge tag upstream/3.4

 CHANGELOG                         |   9 +++++++++
 bash/LiveInstall                  |  13 ++++++++++---
 bash/check_maj                    |   3 +--
 bash/check_maj_                   |  22 +++++++++++++++++++---
 etc/emotes/face-angel.png         | Bin 992 -> 0 bytes
 etc/emotes/face-crying.png        | Bin 936 -> 0 bytes
 etc/emotes/face-devilish.png      | Bin 855 -> 0 bytes
 etc/emotes/face-glasses.png       | Bin 949 -> 0 bytes
 etc/emotes/face-grin.png          | Bin 905 -> 0 bytes
 etc/emotes/face-kiss.png          | Bin 919 -> 0 bytes
 etc/emotes/face-monkey.png        | Bin 784 -> 0 bytes
 etc/emotes/face-plain.png         | Bin 894 -> 0 bytes
 etc/emotes/face-sad.png           | Bin 918 -> 0 bytes
 etc/emotes/face-smile-big.png     | Bin 896 -> 0 bytes
 etc/emotes/face-smile.png         | Bin 919 -> 0 bytes
 etc/emotes/face-surprise.png      | Bin 917 -> 0 bytes
 etc/emotes/face-wink.png          | Bin 914 -> 0 bytes
 etc/menu/cdrom.png                | Bin 0 -> 934 bytes
 etc/snd/snd.wav                   | Bin 60766 -> 0 bytes
 lang/locale/fr/LC_MESSAGES/pol.mo | Bin 34572 -> 34753 bytes
 lang/po/fr.po                     |   3 +++
 lib/interface_v3                  |  35 ++++++++++++-----------------------
 lib/main                          |   6 +-----
 lib/variables                     |   2 +-
 python/mainwindow.py              |  28 ++++++----------------------
 25 files changed, 62 insertions(+), 59 deletions(-)

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