Merge remote-tracking branch 'origin/developer' into feature/Controller

Browse Source

Added support for second controller
# Conflicts:
#	CrystalPoint.cpp
#	CrystalPoint.h
#	CrystalPoint.vcxproj
#	CrystalPoint.vcxproj.filters

...

This commit is contained in:

jancoow

2016-06-21 11:24:55 +02:00

parent 83557c7ba7 7c4805d899

commit 3f8623d0bf

45 changed files with 1284 additions and 777 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

lib/serial/include/serial.h

+613 -613

File diff suppressed because it is too large Load Diff