]> git.donarmstrong.com Git - neurodebian.git/commitdiff
Merge branch 'master' of alioth:/git/pkg-exppsy/neurodebian
authorMichael Hanke <michael.hanke@gmail.com>
Wed, 3 Nov 2010 12:09:29 +0000 (08:09 -0400)
committerMichael Hanke <michael.hanke@gmail.com>
Wed, 3 Nov 2010 12:09:29 +0000 (08:09 -0400)
* 'master' of alioth:/git/pkg-exppsy/neurodebian:
  resort coffee cans in reverse order so fresh ones appear first
  RF+NF: deploy neurodebian apt key for nd+ cows
  adding libgdf-dev aliases
  updated ascii dump of neuro.debian.net.asc key

1  2 
debian/control

diff --cc debian/control
Simple merge