Merge branch 'map_dataframe' of github.com:mrkrd/thorns into map_dataframe
Startet io module with braninwavef32 import function
Merge branch 'master' of git:mrkrd/thorns into io
Merge branch 'map_dataframe' of git:mrkrd/thorns into io
The software is actually called BrainWare
Docstring
added function to set the column labels
Merge remote-tracking branch 'mrk/master'
Merge remote-tracking branch 'mrk/master' into io
Merge branch 'io'
changed todo umlaut
changed todo umlaut
Merge branch 'master' of ssh://github/encke/thorns into map_dataframe
changed TODO.org