Yury G. Kudryashov ee75764bdb svn merge ^/nixpkgs/trunk ... svn path=/nixpkgs/branches/libpng15/; revision=32338		2012-02-16 18:46:10 +00:00
..
applications	svn merge ^/nixpkgs/trunk	2012-02-16 18:46:10 +00:00
build-support	* Put back the Ubuntu 10.10 images that I accidentally removed.	2012-02-08 11:38:46 +00:00
data
desktops	svn merge ^/nixpkgs/trunk	2012-02-16 11:23:36 +00:00
development	svn merge ^/nixpkgs/trunk	2012-02-16 18:18:34 +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	Updating the cifs utils (I think even the hash did not match for 4.5),	2012-02-15 11:08:38 +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-16 18:46:10 +00:00
top-level	svn merge ^/nixpkgs/trunk	2012-02-16 18:46:10 +00:00