Skip to content

Commit

Permalink
Update README.md
Browse files Browse the repository at this point in the history
  • Loading branch information
chkothe committed Feb 27, 2014
1 parent 8b1a1a3 commit 33bedeb
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,10 @@ MATLAB Toolbox for Brain-Computer Interface Research

This software was written at the Swartz Center for Computational Neuroscience, UCSD. This work was funded by the Army Research Laboratory under Cooperative Agreement Number W911NF-10-2-0022 and a gift from The Swartz Foundation (Old Field, NY).
The design of BCILAB was inspired by a preceding toolbox (the PhyPA toolbox) written in 2006-'09 by C. Kothe with contributions from T. Zander at the Department for Human-Machine Systems, Berlin Institute of Technology.

Guide to branches
-----------------
* master is the stable branch; most of the code has been tested over several months
* testing contains code that is currently being tested, or considered ready for testers; it is usually several months ahead of master and may contain a few buggy functions
* devel is the current development branch: it is the most up-to-date branch that integrates all features, but is frequently partially broken -- not recommended for regular toolbox users
* all other branches are "feature branches" that should not be checked out (most are inactive and have long been merged in, and some others contain half-finished code)

0 comments on commit 33bedeb

Please sign in to comment.