diff options
| author | Trygve Laugstøl <trygvis@inamo.no> | 2015-02-17 20:14:34 +0100 |
|---|---|---|
| committer | Trygve Laugstøl <trygvis@inamo.no> | 2015-02-17 23:30:04 +0100 |
| commit | 254be95ff2f37df8adec7ce068448ba8abc8d734 (patch) | |
| tree | f1483c2ff4c2e194cf90c59ce741d96917f7aaf5 /BluetoothImpl.h | |
| parent | 0d0543e4daeb1c6b01d4799736026b6f3aef9779 (diff) | |
| parent | 0d0749ff0f842f10fea6929dc466e4e1be458234 (diff) | |
| download | ble-toys-254be95ff2f37df8adec7ce068448ba8abc8d734.tar.gz ble-toys-254be95ff2f37df8adec7ce068448ba8abc8d734.tar.bz2 ble-toys-254be95ff2f37df8adec7ce068448ba8abc8d734.tar.xz ble-toys-254be95ff2f37df8adec7ce068448ba8abc8d734.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
Bluetooth.cpp
Bluetooth.h
ByteBuffer.cpp
CMakeLists.txt
LinuxBluetooth.cpp
main.cpp
test/ByteBufferTest.cpp
Diffstat (limited to 'BluetoothImpl.h')
0 files changed, 0 insertions, 0 deletions