diff options
| author | Ferran Pujol Camins <ferranpujolcamins@gmail.com> | 2020-01-19 20:14:50 +0100 |
|---|---|---|
| committer | Ferran Pujol Camins <ferranpujolcamins@gmail.com> | 2020-01-19 20:14:50 +0100 |
| commit | 9cdf435dac257e7e4a0598bac9491025b5605e64 (patch) | |
| tree | 1438f7442281478154217c39dab08a935839c7ac /lib | |
| parent | a17bdf8dc89763c74aadc794ac8574da11dc1d99 (diff) | |
| parent | 9839b45e764e5222054280190b6fe835522e2949 (diff) | |
Merge branch 'master' into migrate-to-QJSEngine
# Conflicts:
# build/depends.py
# src/controllers/hid/hidcontroller.cpp
# src/controllers/hid/hidcontroller.h
Diffstat (limited to 'lib')