~rikmills/+git/elisa-upstream:upnp

Last commit made on 2017-06-01
Get this branch:
git clone -b upnp https://git.launchpad.net/~rikmills/+git/elisa-upstream

Branch merges

Branch information

Name:
upnp
Repository:
lp:~rikmills/+git/elisa-upstream

Recent commits

3700393... by Matthieu Gallien on 2017-06-01

integrate back some code to access UPnP shares

d9acbac... by Matthieu Gallien on 2017-05-31

replace Q_ENUMS by Q_ENUM in UpnpContentDirectoryModel (clazy fix)

0cf098a... by Matthieu Gallien on 2017-05-31

elisa does not depend on KDSoad, only upnp lib does

1762825... by Matthieu Gallien on 2017-05-31

remove two unused attributes in MediaPlayer2Player (clazy fix)

215f626... by Matthieu Gallien on 2017-05-30

do not insert tracks when stop has been requested

c194858... by Matthieu Gallien on 2017-05-30

remove debug print from MediaPlayList

43b14b8... by Matthieu Gallien on 2017-05-30

on grid views, decrease size of buttons over delegates

d0c8192... by Matthieu Gallien on 2017-05-30

use KF5KDBusAddons to have an unique application

30e74a1... by Matthieu Gallien on 2017-05-30

require Qt >= 5.7 and KF5 >= 5.31.0

2fd7109... by l10n daemon script <email address hidden> on 2017-05-22

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"