Getting master up to date with dev

buzsakilab / buzcode

Code for internal lab sharing - polishing has started but is by no means complete

http://www.buzsakilab.com/

GNU General Public License v3.0

118 stars 128 forks source link

Getting master up to date with dev #287

Closed dlevenstein closed 5 years ago

dlevenstein commented 5 years ago

Can folks glance over this over the next few days to see if anything is blatantly wrong?

brendonw1 commented 5 years ago

I might wait a couple weeks on this given the recent changes in TheStateEditor and SleepScore... make sure they are good before sending to master.

dlevenstein commented 5 years ago

alright, think a week or two will be sufficient? @raswanson has been testing the updated TSE/SSM, and @samamckenzie's undergrad will start sometime this week. Between the three of us (and if you have time), we should hopefully run into any missed buggers.

dlevenstein commented 5 years ago

Shall we merge this?