search

google / carfac

Cascade of Asymmetric Resonators with Fast-Acting Compression (CARFAC) cochlear model.
Apache License 2.0
116 stars 43 forks source link

EMScriptenv fixes #10

Closed sedurCode closed 3 years ago

sedurCode commented 3 years ago

Relates to #8

sedurCode commented 3 years ago

Bumped for the changes to master WRT python. Also set to gitignore vscode files, temporaries and users image files

zond commented 3 years ago

I just compared some of the matlab changes, and they are also present in your other PR, right?

I'd prefer if this PR was only about the .gitignore and scons changes, because then I could approve it myself after my node process finishes (which takes basically forever).

sedurCode commented 3 years ago

Sure, I will remove those changes from this PR

sedurCode commented 3 years ago

Matlab changes removed

zond commented 3 years ago

Thanks! Then I'll either go through the bureaucracy of getting the rights to approve, or ask a colleague to approve :)

sedurCode commented 3 years ago

It would also be great if you could squash all of your commits in this PR into a single one to keep the history clean.

Happy to figure out how to, but aren't squash commits typically done during a merge? Or is that only with bitbucket?

sedurCode commented 3 years ago

It would also be great if you could squash all of your commits in this PR into a single one to keep the history clean.

Done! @ronw