]> git.donarmstrong.com Git - neurodebian.git/commitdiff
projects / neurodebian.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 856dd7d 72b5e47)
Merge branch 'master' of git.debian.org:/git/pkg-exppsy/neurodebian
authorMichael Hanke <michael.hanke@gmail.com>
Fri, 2 Sep 2011 06:38:30 +0000 (08:38 +0200)
committerMichael Hanke <michael.hanke@gmail.com>
Fri, 2 Sep 2011 06:38:30 +0000 (08:38 +0200)
* 'master' of git.debian.org:/git/pkg-exppsy/neurodebian:
  1 fresh pic from swaroop
  injected entry for PyMEG
  minor from a drunken mind


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