]> git.donarmstrong.com Git - neurodebian.git/commitdiff
projects / neurodebian.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0cfea3 23b8db5)
Merge branch 'master' of git.debian.org:/git/pkg-exppsy/neurodebian
authorMichael Hanke <michael.hanke@gmail.com>
Wed, 1 May 2013 08:06:52 +0000 (10:06 +0200)
committerMichael Hanke <michael.hanke@gmail.com>
Wed, 1 May 2013 08:06:52 +0000 (10:06 +0200)
* 'master' of git.debian.org:/git/pkg-exppsy/neurodebian:
  ENH: 1 more "build-dependency" for the website
  BF: previous monkey-patch doesn't work with elderly backport of sphinx (1.0.7) on squeeze
  ENH: monkey patch regexp for english words -- we need to allow searching package names
  Updated submodules.

1  2 
Makefile patch | diff1 | diff2 | blob | history

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