1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 14:45:27 +00:00
nixpkgs/pkgs
Eelco Dolstra 585983bc95 Merge remote-tracking branch 'origin/staging'
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
2014-09-08 11:42:09 +02:00
..
applications Merge remote-tracking branch 'origin/staging' 2014-09-08 11:42:09 +02:00
build-support Merge remote-tracking branch 'origin/staging' 2014-09-08 11:42:09 +02:00
data shared_mime_info: update from 1.2 to 1.3 2014-09-06 19:02:27 +02:00
desktops Merge remote-tracking branch 'origin/staging' 2014-09-08 11:42:09 +02:00
development Merge remote-tracking branch 'origin/staging' 2014-09-08 11:42:09 +02:00
games Merge remote-tracking branch 'origin/staging' 2014-09-08 11:42:09 +02:00
misc libretro-cores: 2014-09-04 20:03:13 +02:00
os-specific Merge remote-tracking branch 'origin/staging' 2014-09-08 11:42:09 +02:00
servers Merge remote-tracking branch 'origin/staging' 2014-09-08 11:42:09 +02:00
shells
stdenv
test
tools Merge remote-tracking branch 'origin/staging' 2014-09-08 11:42:09 +02:00
top-level Merge remote-tracking branch 'origin/staging' 2014-09-08 11:42:09 +02:00