]> git.donarmstrong.com Git - neurodebian.git/commit
projects / neurodebian.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8d04671 daa9f4b)
Merge branch 'master' into newdesign
authorMichael Hanke <michael.hanke@gmail.com>
Fri, 7 Dec 2012 08:38:03 +0000 (09:38 +0100)
committerMichael Hanke <michael.hanke@gmail.com>
Fri, 7 Dec 2012 08:38:03 +0000 (09:38 +0100)
commit1f3e1e3baea966d60a549aaa16e5e03ad890a473
treef5d6c18bd460744d71685de02b2cc60945f56ba3tree | snapshot
parent8d046715f25a8be6ce6e03e35304707a2962b008commit | diff
parentdaa9f4b4c6fabcdd1abe8b53d760a7ece4681e01commit | diff
Merge branch 'master' into newdesign

* master:
  updated VM page for 6.0.6 (with the date when VM was wrapped on 1st of Oct)
  add remake to give it a page

Conflicts:
sphinx/vm.rst
sphinx/vm.rst diff1 | diff2 | blob | history
This is a branch of the neurodebian git repository; upstream is here: git://anonscm.debian.org/pkg-exppsy/neurodebian.git