nixpkgs/pkgs/servers/http/apache-httpd
Eelco Dolstra 10cb4a8cf2 Merge remote-tracking branch 'origin/master' into multiple-outputs
Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libsndfile/default.nix
	pkgs/misc/cups/default.nix
	pkgs/top-level/all-packages.nix
2013-08-21 17:05:30 +02:00
..
2.2.nix Merge remote-tracking branch 'origin/master' into multiple-outputs 2013-08-21 17:05:30 +02:00
2.4.nix apacheHttpd_2_4: fix build on darwin 2013-07-07 13:46:43 +02:00