Rok Garbas 33d957b34b Merge branch 'libspotify' of git://github.com/lovek323/nixpkgs into lovek323-libspotify ... Conflicts: pkgs/top-level/all-packages.nix		2013-07-06 13:51:31 +02:00
..
applications	kile: minor update	2013-07-05 14:45:58 +02:00
build-support	Add CentOS 6.4 to vm images	2013-07-05 17:52:42 +02:00
data	nixos.org/tarballs -> tarballs.nixos.org	2013-06-25 14:12:16 +02:00
desktops	kde4: unify used libcanberra	2013-07-05 14:45:44 +02:00
development	Merge branch 'libspotify' of git://github.com/lovek323/nixpkgs into lovek323-libspotify	2013-07-06 13:51:31 +02:00
games	libpng: keep versioning in all-packages.nix, not in individual expressions	2013-06-27 21:35:21 +02:00
lib	Doh	2013-07-03 16:35:13 +02:00
misc	keep lcms versioning in all-packages.nix	2013-07-01 07:52:13 +02:00
os-specific	Merge branch 'libspotify' of git://github.com/lovek323/nixpkgs into lovek323-libspotify	2013-07-06 13:51:31 +02:00
servers	Merge pull request #658 from aristidb/master	2013-06-29 07:57:18 -07:00
shells	fish: Add fish 2.0.0	2013-06-04 10:20:30 +01:00
stdenv	nixos.org/tarballs -> tarballs.nixos.org	2013-06-25 14:12:16 +02:00
test
tools	testdisk: Add to channel	2013-07-05 17:29:53 +02:00
top-level	Merge branch 'libspotify' of git://github.com/lovek323/nixpkgs into lovek323-libspotify	2013-07-06 13:51:31 +02:00