]> git.donarmstrong.com Git - neurodebian.git/commitdiff
projects / neurodebian.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 292a161 63be718)
Merge branch 'master' of git.debian.org:/git/pkg-exppsy/neurodebian
authorMichael Hanke <michael.hanke@gmail.com>
Fri, 9 Sep 2011 02:20:18 +0000 (04:20 +0200)
committerMichael Hanke <michael.hanke@gmail.com>
Fri, 9 Sep 2011 02:20:18 +0000 (04:20 +0200)
* 'master' of git.debian.org:/git/pkg-exppsy/neurodebian:
  adding blend entry for psychlops project


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