Peter Hoeg 8016f9b4c9 Merge pull request #34611 from peterhoeg/p/descent ... descent 1 & 2: use assets from gog.com with the dxx-rebirth project		2018-02-12 22:31:41 +08:00
..
applications	Merge pull request #34849 from oxij/pkgs/firefoxes	2018-02-12 11:15:29 +00:00
build-support	Merge pull request #34611 from peterhoeg/p/descent	2018-02-12 22:31:41 +08:00
common-updater
data	maintainers: capitalize the Profpatsch attribute (vanity)	2018-02-12 07:24:50 +01:00
desktops	Merge pull request #34468 from grwlf/xfce4-weather	2018-02-11 11:56:53 +00:00
development	pythonPackages.Nikola: remove input pytest-mock	2018-02-12 14:22:40 +02:00
games	Merge pull request #34611 from peterhoeg/p/descent	2018-02-12 22:31:41 +08:00
misc	Merge branch 'master' into add_vim_plugins	2018-02-10 12:38:56 +00:00
os-specific	linux-copperhead: 4.15.2.a -> 4.15.3.a	2018-02-12 07:56:21 -05:00
servers	remove profpatsch from maintainer list of a few packages	2018-02-12 06:24:38 +01:00
shells	Merge pull request #34689 from dtzWill/fix/zsh-modern	2018-02-09 09:29:32 +00:00
stdenv	check-meta: Use concatStrings	2018-02-11 00:17:47 +02:00
test
tools	Merge pull request #34611 from peterhoeg/p/descent	2018-02-12 22:31:41 +08:00
top-level	Merge pull request #34611 from peterhoeg/p/descent	2018-02-12 22:31:41 +08:00