nixpkgs/pkgs/applications
Yury G. Kudryashov 5144a19987 svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
..
audio svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +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-02-10 10:24:30 +00:00
graphics svn merge ^/nixpkgs/trunk 2012-02-10 10:24:30 +00:00
misc svn merge ^/nixpkgs/trunk 2012-02-10 10:24:30 +00:00
networking svn merge ^/nixpkgs/trunk 2012-02-10 10:24:30 +00:00
office svn merge ^/nixpkgs/trunk 2012-02-10 10:24:30 +00:00
science svn merge ^/nixpkgs/trunk 2012-02-10 10:24:30 +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-02-10 10:24:30 +00:00
video svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
virtualization * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
window-managers svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00