]> git.donarmstrong.com Git - neurodebian.git/commitdiff
projects / neurodebian.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d0ca06f 322ae2d)
Merge branch 'master' into newdesign
authorMichael Hanke <michael.hanke@gmail.com>
Sun, 23 Sep 2012 19:10:34 +0000 (21:10 +0200)
committerMichael Hanke <michael.hanke@gmail.com>
Sun, 23 Sep 2012 19:10:34 +0000 (21:10 +0200)
* master:
  injected spykeview
  BF: added an alias for neo (python-neo)


Trivial merge
This is a branch of the neurodebian git repository; upstream is here: git://anonscm.debian.org/pkg-exppsy/neurodebian.git