Fixup merge...
authorPavel A <pavel_a@live.com>
Sat, 2 Apr 2016 23:07:10 +0000 (02:07 +0300)
committerPavel A <pavel_a@live.com>
Sat, 2 Apr 2016 23:07:10 +0000 (02:07 +0300)
commit85fe04b805681646aeff75fabb6cd3f068de7e03
tree3b9ef4f0d5d3784097c6487c899d8dce3ea6d839
parent645340bec333362ccfd58db9fc34ddd6b3b4b91a
parent4d4cf25afed787291a65570c2b0dfa711c80b125
Fixup merge...
.editorconfig
commandline/usbrelay-cmd.c