nixpkgs/pkgs/applications
Yury G. Kudryashov 9ee0a9df9b svn merge ^/nixpkgs/trunk
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
..
audio Fix most packages depending on fltk 2012-01-03 10:32:56 +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-04 09:54:17 +00:00
graphics -kde3.kuickshow, +kde4.kuickshow 2012-01-07 17:06:57 +00:00
misc svn merge ^/nixpkgs/trunk 2012-01-08 16:01:12 +00:00
networking svn merge ^/nixpkgs/trunk 2012-01-08 16:01:12 +00:00
office ledger3: Get building on darwin 2012-01-06 15:55:24 +00:00
science svn merge ^/nixpkgs/trunk 2012-01-08 16:01:12 +00:00
taxes * Add Aangifte 2010. 2011-03-23 16:06:36 +00:00
version-management git-annex: updated to version 3.20111231 2012-01-02 14:51:26 +00:00
video State qt version (3/4) in packages, not in all-packages.nix 2012-01-07 17:06:49 +00:00
virtualization applications/virtualization/qemu: Added 0.15.nix 2012-01-07 15:06:49 +00:00
window-managers Updating dwm to 6.0. 2012-01-04 22:05:26 +00:00