]> git.donarmstrong.com Git - neurodebian.git/commitdiff
projects / neurodebian.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 430b1ea 16688a1)
Merge branch 'master' of git.debian.org:/git/pkg-exppsy/neurodebian
authorMichael Hanke <michael.hanke@gmail.com>
Fri, 9 Mar 2012 16:45:53 +0000 (17:45 +0100)
committerMichael Hanke <michael.hanke@gmail.com>
Fri, 9 Mar 2012 16:45:53 +0000 (17:45 +0100)
* 'master' of git.debian.org:/git/pkg-exppsy/neurodebian:
  FIX: oops - I did it again
  Added [ua] mirror
  Live image page: installation instructions, version history, added screenshot; derivatives page: added NeuroDebian packages included (2nd try)
  Live image page: installation instructions, version history, added screenshot; derivatives page: added NeuroDebian packages included
  oopsy -- fixing what should have not been committed
  Added a basic icon for derivatives page


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