Benjamin Staffin 4d4bd3d353 Merge pull request #24902 from chris-martin/pr/idea-2017-1-1 ... jetbrains.idea-{community,ultimate}: 2017.1 -> 2017.1.1		2017-04-14 19:04:02 -04:00
..
applications	Merge pull request #24902 from chris-martin/pr/idea-2017-1-1	2017-04-14 19:04:02 -04:00
build-support	buildFHSEnv: add ACLOCAL_PATH	2017-04-12 14:43:08 +03:00
common-updater
data	envypn-font: init at 1.7.1	2017-04-12 17:14:26 -05:00
desktops	Merge: fixup a bad merge	2017-04-14 19:11:17 +02:00
development	Merge: fixup a bad merge	2017-04-14 19:11:17 +02:00
games	steam: move libpciaccess as non-runtime dependencies	2017-04-11 01:51:46 +03:00
misc	vim-elixir: 2017-03-29 -> 2017-04-13	2017-04-13 18:46:37 +02:00
os-specific	kernel-config: Explicitly enable CONFIG_NETFILTER	2017-04-14 20:43:50 +03:00
servers	Merge: fixup a bad merge	2017-04-14 19:11:17 +02:00
shells	Merge pull request #24760 from matthewbauer/linux-only-pkgs	2017-04-09 14:18:10 +02:00
stdenv	stdenv: ARM bootstrap: Update bootstrap tarballs to latest hydra-built ones	2017-04-15 01:52:33 +03:00
test
tools	Merge pull request #24906 from ndowens/speedtest	2017-04-14 19:02:45 -04:00
top-level	Merge: fixup a bad merge	2017-04-14 19:11:17 +02:00