Joachim Fasting c4626ad354 Merge pull request #14887 from sheenobu/bugfix/14886/vbox_cpucore ... virtualbox: obey NIX_BUILD_CORES for make invocation		2016-04-23 19:42:31 +02:00
..
applications	Merge pull request #14887 from sheenobu/bugfix/14886/vbox_cpucore	2016-04-23 19:42:31 +02:00
build-support	Merge pull request #14888 from dezgeg/pr-kill-module-init-tools	2016-04-23 14:29:41 +03:00
data	zeal: move to qmakeHook	2016-04-20 18:55:50 +03:00
desktops	Merge pull request #14916 from NicolasPetton/file-roller-nautilus-extension	2016-04-23 18:42:06 +02:00
development	Merge pull request #14913 from makkus/seafile	2016-04-23 19:08:15 +02:00
games	Merge pull request #14906 from rardiol/dwarf-fortress-unfuck	2016-04-23 02:42:15 +04:00
misc	seafile-*: 4.4.2 -> 5.0.7	2016-04-23 12:52:42 +12:00
os-specific	Merge pull request #14036 from acowley/darwin-ffmpeg	2016-04-23 15:24:21 +02:00
servers	emby: init at 3.0.5930	2016-04-23 16:13:47 +02:00
shells	fish: Reference correct output of glibc	2016-04-18 21:32:43 +03:00
stdenv	bootstrap-tools-linux: Use tar without acl	2016-04-18 12:04:37 +02:00
test	Merge branch 'master' into closure-size	2016-04-01 10:06:01 +02:00
tools	Merge pull request #14913 from makkus/seafile	2016-04-23 19:08:15 +02:00
top-level	emby: init at 3.0.5930	2016-04-23 16:13:47 +02:00