Tuomas Tynkkynen ef64208eba Merge commit '3ab2949' from staging into master ... Conflicts: pkgs/development/compilers/llvm/6/llvm.nix pkgs/servers/home-assistant/component-packages.nix		2018-03-15 22:30:56 +02:00
..
astronomy	Merge branch 'master'	2018-03-05 14:53:27 +01:00
biology	paml: 4.9c -> 4.9g	2018-03-09 07:22:27 -08:00
chemistry	treewide: transition mesa to libGLU_combined	2018-02-24 17:06:49 +02:00
electronics	Merge pull request #36627 from ryantm/auto-update/ngspice	2018-03-14 21:13:22 +00:00
geometry	pkgs: refactor needless quoting of homepage meta attribute (#27809)	2017-08-01 22:03:30 +02:00
logic	treewide: s/xlibs/xorg/g (#36889)	2018-03-13 10:16:03 +00:00
machine-learning	shogun: add patch for json-c 0.13	2018-03-05 22:00:03 +01:00
math	Merge pull request #36483 from ryantm/auto-update/calc	2018-03-14 19:37:27 +00:00
medicine/aliza	treewide: transition mesa to libGLU_combined	2018-02-24 17:06:49 +02:00
misc	Merge branch 'master'	2018-03-05 14:53:27 +01:00
molecular-dynamics	pkgs: refactor needless quoting of homepage meta attribute (#27809)	2017-08-01 22:03:30 +02:00
physics	sherpa: 2.2.1 -> 2.2.4	2017-08-31 14:32:05 -04:00
programming	fdr: 4.2.0 -> 4.2.3	2017-12-29 02:01:31 +01:00
robotics	yarp: 2.3.68 -> 2.3.70.2	2018-03-09 19:41:31 -08:00
spyder	python: spyder: 3.2.6 -> 3.2.7	2018-02-26 18:44:17 +01:00