Yury G. Kudryashov 5b132f6e96 svn merge ^/nixpkgs/trunk ... Conflicts: cups, all-packages.nix (gcc45_debug) svn path=/nixpkgs/branches/stdenv-updates/; revision=31863		2012-01-26 15:27:03 +00:00
..
audio	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
display-managers/slim	* slim: update to 1.3.2.	2011-02-14 10:15:48 +00:00
editors	svn merge ^/nixpkgs/trunk	2012-01-26 15:27:03 +00:00
graphics	svn merge ^/nixpkgs/trunk	2012-01-26 15:27:03 +00:00
misc	* Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.	2012-01-18 20:53:01 +00:00
networking	svn merge ^/nixpkgs/trunk	2012-01-26 15:27:03 +00:00
office	svn merge ^/nixpkgs/trunk	2012-01-26 15:27:03 +00:00
science	* Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.	2012-01-18 20:53:01 +00:00
taxes	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
version-management	svn merge ^/nixpkgs/trunk	2012-01-26 15:27:03 +00:00
video	svn merge ^/nixpkgs/trunk	2012-01-26 15:27:03 +00:00
virtualization	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
window-managers	* Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.	2012-01-18 20:53:01 +00:00