You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Merge must be done very carefully because we have modified the host driver. git diff and git blame can be helpful commands here, e.g., git blame -L 880,922 socket.c would show that most of simple_link_recv had not changed since August 2013, but that lines 906-916 changed in February 2014.
Used "Winmerge" utility to manually merge the differences. Tested using the latest patch. Everything seems to be working normal. Will test further before letting you know if this can be merged with the master.
Merge must be done very carefully because we have modified the host driver.
git diff
andgit blame
can be helpful commands here, e.g.,git blame -L 880,922 socket.c
would show that most ofsimple_link_recv
had not changed since August 2013, but that lines 906-916 changed in February 2014.See http://processors.wiki.ti.com/index.php/CC3000_Release_Notes
The text was updated successfully, but these errors were encountered: