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 /libicclient | |
parent | d82340151ce274930f42701f5a9a0c4db702cba4 (diff) | |
parent | 9fef837e6275697f4562f60c2546c5e025ec5435 (diff) |
Merge branch 'master' into cmake
# Conflicts:
# qicclient.pro
Diffstat (limited to 'libicclient')
m--------- | libicclient | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libicclient b/libicclient -Subproject 685d975434d9311e5afebe9f933509f8bb2ad61 +Subproject 6fa0df3c46986b15dec3be672f41eb7ea62c20e |