Yury G. Kudryashov 5c6a3faf4e Merge ^/nixpkgs/trunk ... svn tried to change libpng/default.nix version, I've changed libpng/12.nix version manually. svn path=/nixpkgs/branches/libpng15/; revision=32395		2012-02-19 11:06:00 +00:00
..
applications	Merge ^/nixpkgs/trunk	2012-02-19 11:06:00 +00:00
build-support	* Put back the Ubuntu 10.10 images that I accidentally removed.	2012-02-08 11:38:46 +00:00
data	svn merge ^/nixpkgs/trunk	2012-02-18 16:26:34 +00:00
desktops	Merge ^/nixpkgs/trunk	2012-02-19 11:06:00 +00:00
development	Merge ^/nixpkgs/trunk	2012-02-19 11:06:00 +00:00
games	svn merge ^/nixpkgs/trunk	2012-02-16 18:18:34 +00:00
lib
misc	svn merge ^/nixpkgs/trunk	2012-02-07 09:38:20 +00:00
os-specific	* Include the kernel version in kernel-specific packages so that they	2012-02-17 14:32:28 +00:00
servers	* Updated Apache httpd to 2.2.22.	2012-02-15 16:21:44 +00:00
shells
stdenv
test
tools	svn merge ^/nixpkgs/trunk	2012-02-17 17:44:20 +00:00
top-level	Merge ^/nixpkgs/trunk	2012-02-19 11:06:00 +00:00