diff options
| author | Rob Austein <sra@hactrn.net> | 2017-04-30 10:37:39 -0400 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2017-04-30 10:37:39 -0400 |
| commit | 2791ee836b2e55076bc109cda19f5b686b6a97d6 (patch) | |
| tree | fe73a43c7a0e297c0cc70da3820138b29d2b289d /libraries/libcli | |
| parent | 73b784eac101085b8734d2188ae59b5295a80839 (diff) | |
| parent | 99c8452187b2f99a92fbbea50ea1968d209b7c44 (diff) | |
Merge branch 'ksng' into no-rtos
Required minor manual intervention to resolve merge issues git had no
way of understanding: git is clever, but not quite clever enough to
understand that a commit in branch had removed the entire RTOS that a
commit in the other branch was using. No big deal, just a couple of
osDelay() calls needing conversion to HAL_Delay() or task_delay().
Diffstat (limited to 'libraries/libcli')
0 files changed, 0 insertions, 0 deletions