Merge branch 'master' of https://gerrit.automotivelinux.org/gerrit/p/staging/HomeScreen
authorBocklage, Jens <Jens_Bocklage@mentor.com>
Thu, 22 Dec 2016 12:34:02 +0000 (13:34 +0100)
committerBocklage, Jens <Jens_Bocklage@mentor.com>
Thu, 22 Dec 2016 12:34:02 +0000 (13:34 +0100)
commit482d3b93a673f11ea8aa295a7d77db890d100665
treeaa5b70eb984a22b32d4dc64c2f284329579abae0
parent346f8a48278f2cc63ee76050415582ae4f44400c
parent064e77ad3b5989d011b5b26980c5d88ca163a82e
Merge branch 'master' of https://gerrit.automotivelinux.org/gerrit/p/staging/HomeScreen

Conflicts:
HomeScreen/src/applicationmodel.cpp