diff options
author | Jean-François Milants <jf@codingfield.com> | 2021-07-24 18:46:52 +0200 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2021-07-24 18:46:52 +0200 |
commit | 926553d04386341f60eaf8c2abb3f50c65b8fb04 (patch) | |
tree | 6c40390ff67374d7f072423364533ebc85ccbb63 /src/drivers/Bma421.h | |
parent | d6cccc2dcd95a7d332ee657d1357ae060389f6e6 (diff) | |
parent | 95b8a56dd42da067b56e37111577427518d825fb (diff) |
Merge branch 'fix_touchevent_tap' of git://github.com/Riksu9000/InfiniTime into Riksu9000-fix_touchevent_tap
# Conflicts:
# src/displayapp/DisplayApp.cpp
Diffstat (limited to 'src/drivers/Bma421.h')
0 files changed, 0 insertions, 0 deletions