Resolve conflicts between danbone/issue_143_icache on PR #152 and branch master
:thinking: Shobhit, how did you do the merge? There shouldn't be this many files changed...
@klingaard, I have mistakenly committed .idea and cmake-build-debug too, removing them should decrease the number of files changed to ~40 files. To do the merge, I copied the branch on PR #152 under my name, and merged master branch into it after resolving conflicts.
removed extra files and folders (.idea, cmake-build-debug, etc) from the PR
Removed generated log files
I was facing some issues with the version of stflib which was there in dan's PR, therefore updated it. However, the version of stflib which is in upstream branch works too. I have updated the stflib submodule to keep it consistent with the present version in olympia.