Vladimír Čunát 0a58b512cb Merge master into stdenv-updates ... Conflicts (simple): pkgs/development/compilers/gcc/4.8/default.nix pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/gmp/5.1.1.nix pkgs/development/libraries/gmp/5.1.3.nix pkgs/development/libraries/gmp/5.1.x.nix pkgs/top-level/all-packages.nix		2014-01-18 14:46:20 +01:00
..
cups	cupsBjnp: update from 0.5.4 to 1.2.1	2013-12-18 18:18:23 +02:00
drivers	foomatic_filters: update from 4.0.12 to 4.0.17	2013-12-18 18:18:27 +02:00
emulators	Merge master into stdenv-updates	2014-01-18 14:46:20 +01:00
foldingathome
freestyle
ghostscript
gxemul
jackaudio
lilypond
maven
my-env
screensavers	xscreensaver: update from 5.19 to 5.26	2013-12-21 02:28:26 +02:00
solfege	solfege: refactor meta attributes	2013-11-24 13:27:24 +01:00
source-and-tags
themes	gnome_themes_standard: bump to 3.10.0 and move into gnome3 attrset	2014-01-10 01:45:32 +01:00
uboot
vim-plugins	vimPlugins.golang: add expression	2013-12-16 01:21:23 +00:00
xosd
misc.nix