]> git.donarmstrong.com Git - neurodebian.git/commitdiff
projects / neurodebian.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8409b53 d25e076)
Merge remote branch 'alioth/master'
authorMichael Hanke <michael.hanke@gmail.com>
Tue, 22 Mar 2011 13:05:46 +0000 (09:05 -0400)
committerMichael Hanke <michael.hanke@gmail.com>
Tue, 22 Mar 2011 13:05:46 +0000 (09:05 -0400)
* alioth/master:
  added joblib and sphinx into the listing for ease of tracking

1  2 
neurodebian.cfg patch | diff1 | diff2 | blob | history

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