nixpkgs/pkgs
Domen Kožar 4aa3eec330 Merge branch 'master' into staging
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
2014-12-07 14:02:48 +01:00
..
applications Merge branch 'master' into staging 2014-12-07 14:02:48 +01:00
build-support Merge branch 'master' into staging 2014-12-07 14:02:48 +01:00
data Merge branch 'master' into staging 2014-11-26 21:48:26 +01:00
desktops Merge branch 'master' into staging 2014-12-07 14:02:48 +01:00
development Merge branch 'master' into staging 2014-12-07 14:02:48 +01:00
games tibia: update to 10.64 2014-12-04 13:44:30 +00:00
misc Add the Clearlooks-Phenix GTK3 Theme 2014-12-05 05:13:17 -05:00
os-specific Merge branch 'master' into staging 2014-12-07 14:02:48 +01:00
servers Merge branch 'master' into staging 2014-12-07 14:02:48 +01:00
shells Merge branch 'master' into staging 2014-12-07 14:02:48 +01:00
stdenv Merge remote-tracking branch 'origin/bash-4.3' into staging 2014-11-16 22:18:08 +01:00
test
tools Merge branch 'master' into staging 2014-12-07 14:02:48 +01:00
top-level Merge branch 'master' into staging 2014-12-07 14:02:48 +01:00