ndeadly
|
198e7fa15e
|
Merge branch 'develop' into master
|
2020-09-16 22:21:54 +02:00 |
|
ndeadly
|
25e78ce6bc
|
Merge branch 'feature/steelseries-support' into develop
# Conflicts:
# bluetooth-mitm/source/controllers/controller_management.cpp
# bluetooth-mitm/source/controllers/controller_management.hpp
|
2020-09-13 00:30:30 +02:00 |
|
ndeadly
|
0a7725f430
|
bluetooth-mitm: add skeleton handler for steelseries controller
|
2020-09-12 15:09:33 +02:00 |
|
ndeadly
|
9834da157d
|
bluetooth-mitm: add skeleton handler for gamesir controller
|
2020-09-12 14:20:02 +02:00 |
|
ndeadly
|
c380ae777d
|
Merge branch 'develop' into master
|
2020-09-12 01:29:46 +02:00 |
|
ndeadly
|
b4f8b61eb0
|
Merge branch 'feature/integrated-btm-mitm' into develop
# Conflicts:
# bluetooth-mitm/source/btdrv_mitm/controllers/default_controller.cpp
# bluetooth-mitm/source/btdrv_mitm/controllers/default_controller.hpp
|
2020-09-11 23:16:25 +02:00 |
|
ndeadly
|
2741cf3734
|
Rename btdrv-mitm to bluetooth-mitm
|
2020-09-08 17:07:59 +02:00 |
|