philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
nixpkgs/pkgs
History
Peter Simons c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
..
applications Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-12-04 18:33:52 +01:00
build-support Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-12-04 18:33:52 +01:00
data shared_mime_info: update from 1.1 to 1.2 2013-12-04 06:53:44 +02:00
desktops KDE-4.11: update to 4.11.4 2013-12-04 16:57:36 +02:00
development Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-12-04 18:33:52 +01:00
games Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-12-04 18:33:52 +01:00
misc Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-12-04 18:33:52 +01:00
os-specific Adding libnl 3.2.19 to use instead of the latest with ntrack 2013-12-02 22:47:52 +04:00
servers Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-12-04 18:33:52 +01:00
shells Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-12-04 18:33:52 +01:00
stdenv Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-12-04 18:33:52 +01:00
test
tools Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-12-04 18:33:52 +01:00
top-level Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-12-04 18:33:52 +01:00