Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/misc/vim-plugins/default.nix		2014-07-22 11:00:00 +02:00
..
all-packages.nix	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
guile-2-test.nix
haskell-defaults.nix
haskell-packages.nix
make-tarball.nix
node-packages-generated.nix
node-packages.json
node-packages.nix
perl-packages.nix
php-packages.nix
platforms.nix
python-packages-generated.nix
python-packages.json
python-packages.nix	added metainformation for gpodder and mygpoclient	2014-07-21 21:41:27 +02:00
release-cross.nix
release-lib.nix
release-python.nix
release-small.nix
release.nix