diff options
| author | Juergen Bocklage-Ryannel <juergen@ryannel.org> | 2018-03-07 18:33:15 +0100 |
|---|---|---|
| committer | Juergen Bocklage-Ryannel <juergen@ryannel.org> | 2018-03-07 18:33:15 +0100 |
| commit | 183aeabc79e8d0791d9b6583923a3bd091663686 (patch) | |
| tree | 7d86c9b5758650ae10bdb02111853be7df8e3b67 /qface/builtin/qtqml/__init__.py | |
| parent | e04a782de7161828b945b58aee12a22c0906a9f1 (diff) | |
| parent | c7b805476b038a0f60257b5ddfb8ebfc065bf62f (diff) | |
Merge branch 'feature/profile' into develop
# Conflicts:
# qface/idl/profile.py
Diffstat (limited to 'qface/builtin/qtqml/__init__.py')
0 files changed, 0 insertions, 0 deletions