diff options
| author |   Bocklage, Jens <Jens_Bocklage@mentor.com> | 2016-12-22 13:34:02 +0100 |
|---|---|---|
| committer | Bocklage, Jens <Jens_Bocklage@mentor.com> | 2016-12-22 13:34:02 +0100 |
| commit | 482d3b93a673f11ea8aa295a7d77db890d100665 (patch) | |
| tree | aa5b70eb984a22b32d4dc64c2f284329579abae0 | |
| parent | 346f8a48278f2cc63ee76050415582ae4f44400c (diff) | |
| parent | 064e77ad3b5989d011b5b26980c5d88ca163a82e (diff) | |
Merge branch 'master' of https://gerrit.automotivelinux.org/gerrit/p/staging/HomeScreen
Conflicts:
HomeScreen/src/applicationmodel.cpp
0 files changed, 0 insertions, 0 deletions