Frederik Rietdijk a4db058e7b Merge pull request #34809 from typetetris/master ... python.pkgs: msgpack changes and neovim update		2018-02-10 14:35:00 +00:00
..
applications	Merge pull request #34809 from typetetris/master	2018-02-10 14:35:00 +00:00
build-support	defaultCrateOverrides: add pq-sys	2018-02-10 06:59:56 -06:00
common-updater
data	Merge remote-tracking branch 'upstream/master' into staging	2018-02-03 02:50:21 +02:00
desktops	Merge pull request #34526 from ttuegel/bugfix/plasma-integration/font-style	2018-02-04 17:41:50 -06:00
development	pythonPackages.neovim: 0.2.0 -> 0.2.1	2018-02-10 15:10:55 +01:00
games	Merge pull request #34255 from gnidorah/vkquake	2018-02-10 12:46:14 +00:00
misc	Merge branch 'master' into add_vim_plugins	2018-02-10 12:38:56 +00:00
os-specific	Merge pull request #34792 from dywedir/bcachefs	2018-02-10 08:20:35 +00:00
servers	pythonPackages.msgpack: renamed to msgpack-python	2018-02-10 14:47:19 +01:00
shells	Merge pull request #34689 from dtzWill/fix/zsh-modern	2018-02-09 09:29:32 +00:00
stdenv
test
tools	pythonPackages.msgpack: renamed to msgpack-python	2018-02-10 14:47:19 +01:00
top-level	Merge pull request #34809 from typetetris/master	2018-02-10 14:35:00 +00:00