Tuomas Tynkkynen 2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/development/tools/build-managers/conan/default.nix		2018-03-13 23:04:18 +02:00
..
apulse	apulse: 0.1.11 -> 0.1.11 git, enable tracing by default	2018-03-09 20:48:24 +00:00
base16-builder	nodePackages: fix evaluation	2018-03-13 00:44:41 +01:00
beep
cups	Merge #35113: cups: upstream patch for a bug	2018-02-24 22:30:18 +01:00
drivers	hplip: 3.17.10 -> 3.17.11	2018-03-12 21:48:45 +02:00
emulators	treewide: s/saneBackends/sane-backends/g	2018-03-13 00:47:10 +00:00
foldingathome
frescobaldi
ghostscript
gnash	treewide: transition mesa to libGLU_combined	2018-02-24 17:06:49 +02:00
gnuk
jackaudio	Merge pull request #36885 from obsidiansystems/meta-host-prepare	2018-03-12 19:06:35 -04:00
libcardiacarrest	libcardiacarrest: init at 11.0-6	2018-03-09 20:49:30 +00:00
lilypond
logging/beats	elk: 5.6.5 -> 5.6.6	2018-01-17 02:11:19 +01:00
long-shebang
mnemonicode
mxt-app
my-env	myEnvFun: fix sed script edit	2018-01-28 23:49:04 -08:00
phabricator
riscv-pk	riscv-pk: Properly respect --prefix.	2018-02-20 10:29:43 -05:00
sailsd
screensavers	xfce: do not use old names	2018-03-12 23:01:06 +00:00
seafile-shared	Remove myself as maintainer	2018-03-11 00:46:41 +01:00
solfege
sound-of-sorting
source-and-tags
talkfilters
themes	deepin-gtk-theme: move to deepin meta package	2018-03-01 10:00:05 -03:00
tw-rs
uboot	buildUboot: add openssl to nativeBuildInputs	2017-12-23 04:31:11 +02:00
urbit
vim-plugins	vim-solidity: init at 2018-02-11	2018-03-12 23:17:03 +08:00
vscode-extensions
xosd