]> git.donarmstrong.com Git - neurodebian.git/commitdiff
projects / neurodebian.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9d2ddb 1870489)
Merge branch 'master' of alioth:/git/pkg-exppsy/neurodebian
authorMichael Hanke <michael.hanke@gmail.com>
Tue, 7 Jun 2011 16:42:50 +0000 (12:42 -0400)
committerMichael Hanke <michael.hanke@gmail.com>
Tue, 7 Jun 2011 16:42:50 +0000 (12:42 -0400)
* 'master' of alioth:/git/pkg-exppsy/neurodebian:
  Let's not put ideas into the visitor's mouth -- remove "under-estimation" claim
  ENH: survey results -- mark later-on added entries with a dagger
  RF+ENH: move commonly useful dict with what entries were added into common.py
  add a quote from Stephan's CV paper
  added XNAT
  more ignores
  pixid has its own package now

1  2 
survey/makestats patch | diff1 | diff2 | blob | history

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