]> git.donarmstrong.com Git - neurodebian.git/commitdiff
projects / neurodebian.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 96b49ec 955b361)
Merge branch 'master' of git.debian.org:/git/pkg-exppsy/neurodebian
authorMichael Hanke <michael.hanke@gmail.com>
Mon, 12 Sep 2011 18:36:24 +0000 (20:36 +0200)
committerMichael Hanke <michael.hanke@gmail.com>
Mon, 12 Sep 2011 18:36:24 +0000 (20:36 +0200)
* 'master' of git.debian.org:/git/pkg-exppsy/neurodebian:
  pyxnat is now in Debian -- so minimal debian/blends is in the package now


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