diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-17 03:01:08 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2019-09-17 13:50:40 +0200 |
| commit | be2f664d9e7b181909d45cb0531def9da5017e5a (patch) | |
| tree | 394bfb63fb136a869a0430f1a379eff2e49e76fb /configure.json | |
| parent | df0ba9b97c26901f52769381df3c4cbf1fae9ca6 (diff) | |
| parent | 8b0120194e5ab01aa8344d781782dd818a262f02 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/knx/core/qknxbytearray.h
Change-Id: Ieb8bfa6f4adc4f566ae80874df522ab555c4d943
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/configure.json b/configure.json deleted file mode 100644 index 78a1945..0000000 --- a/configure.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "subconfigs": [ - "src/knx" - ] -} |