diff options
author | ꦌ ꦫꦶ ꦏ꧀ꦦꦿ ꦧ ꦮ ꦑ ꦩ ꦭ꧀ <erik@darapsa.co.id> | 2019-10-07 10:19:35 +0800 |
---|---|---|
committer | ꦌ ꦫꦶ ꦏ꧀ꦦꦿ ꦧ ꦮ ꦑ ꦩ ꦭ꧀ <erik@darapsa.co.id> | 2019-10-07 10:19:35 +0800 |
commit | a68fc492cf86a14cf9cf95d9f9a764cdf5b01007 (patch) | |
tree | 3f309d8be302266d4590862112549bc310cb79f0 /.gitmodules | |
parent | d82340151ce274930f42701f5a9a0c4db702cba4 (diff) | |
parent | 9fef837e6275697f4562f60c2546c5e025ec5435 (diff) |
Merge branch 'master' into cmake
# Conflicts:
# qicclient.pro
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions