]> git.donarmstrong.com Git - neurodebian.git/commit
Merge branch 'master' of git://git.debian.org/pkg-exppsy/neurodebian
authorYaroslav Halchenko <debian@onerussian.com>
Mon, 16 May 2011 16:38:05 +0000 (12:38 -0400)
committerYaroslav Halchenko <debian@onerussian.com>
Mon, 16 May 2011 16:38:05 +0000 (12:38 -0400)
commit6bd552f81fba13d383f7640f899df78232325bd0
tree46ba6aa73dadaa91071a7c7066e66c54ad0a2b14
parent54d92a9a238dc5e13a527b18e2251396f3048be1
parenteb3674f0d0e4663e8970604f88828e3f240bd88b
Merge branch 'master' of git://git.debian.org/pkg-exppsy/neurodebian

* 'master' of git://git.debian.org/pkg-exppsy/neurodebian:
  Fix div by zero prob.
  Make time figure.

Conflicts:
survey/makestats -- in list of sources for get_nice_name
survey/Makefile
survey/makestats