Code Review / staging / HomeScreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 346f8a4 064e77a)
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)
Conflicts:
HomeScreen/src/applicationmodel.cpp


Trivial merge