Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
astronomy	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
biology	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
chemistry/avogadro
electronics	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
geometry	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
logic	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
math	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
misc	Fix broken license references.	2014-07-28 11:43:20 +02:00
molecular-dynamics/gromacs
spyder