]> git.donarmstrong.com Git - neurodebian.git/commitdiff
projects / neurodebian.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f73986 84fdaec)
Merge remote-tracking branch 'gh-cengique/master'
authorYaroslav Halchenko <debian@onerussian.com>
Wed, 29 Feb 2012 03:59:28 +0000 (22:59 -0500)
committerYaroslav Halchenko <debian@onerussian.com>
Wed, 29 Feb 2012 03:59:28 +0000 (22:59 -0500)
* gh-cengique/master:
  Several fixes in live image page and minor changes in derivatives page
  Addressed Yaroslav's comments on first draft about usb stick degradation, virtual machines, and clarifying the scope of the license.
  draft version of comp neurosci live usb stick blog page w/o download links

1  2 
sphinx/derivatives.rst patch | diff1 | diff2 | blob | history

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