commit | 4af7668b5f7f400bace566f48f81ab446bcd4e01 | [log] [tgz] |
---|---|---|
author | David Barth <david.barth@canonical.com> | Thu Jan 28 12:24:58 2016 +0100 |
committer | David Barth <david.barth@canonical.com> | Thu Jan 28 12:24:58 2016 +0100 |
tree | 8c9cce49ea87552cb9dc6b3791fe24025286ed7a | |
parent | 1ecfc4f18409c19f29060e33f434a5664a74d5c9 [diff] | |
parent | 9509e621af44ba9db296b88012c34274d0663f20 [diff] |
Merge remote-tracking branch 'ubuntu/master' Conflicts: CordovaUbuntu/CordovaViewInternal.qml