nixpkgs/pkgs/applications/science
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
..
astronomy gravit: cosmetic 2011-11-08 10:01:14 +00:00
biology
chemistry/avogadro Fix typo in URL 2011-08-15 23:39:11 +00:00
electronics Updating kicad. 2011-12-18 14:49:39 +00:00
geometry
logic svn merge ^/nixpkgs/trunk 2012-01-04 15:22:16 +00:00
math maxima: updated to version 5.26.0 2011-12-22 12:30:19 +00:00
misc State qt version (3/4) in packages, not in all-packages.nix 2012-01-07 17:06:49 +00:00