Peter Simons bbbe24f469 Merge pull request #24530 from mulderr/master ... oracle-instantclient: add optional odbc support		2017-04-05 10:24:49 +02:00
..
applications	Merge pull request #24619 from NeQuissimus/docker_17_03_1	2017-04-04 13:44:29 -05:00
build-support	buildRustPackage: Fix "warning: file ... may be generated" (#24471)	2017-03-30 15:15:49 +02:00
common-updater
data	iosevka: 1.11.4 -> 1.12.1 (#24527)	2017-04-03 18:30:49 +01:00
desktops	gnome-keyring: use wrapGAppsHook	2017-04-04 16:53:53 +02:00
development	Merge pull request #24530 from mulderr/master	2017-04-05 10:24:49 +02:00
games	Revert "steam: use custom openssl"	2017-04-03 09:04:44 +02:00
misc	Merge branch 'master' into staging	2017-03-30 12:54:41 -04:00
os-specific	rtags: fix for clang/libc++ 4	2017-04-04 08:07:52 -04:00
servers	Merge pull request #24607 from nh2/fix-24606-consul-version-unknown	2017-04-04 21:30:59 +02:00
shells	oh-my-zsh: 2017-02-27 -> 2017-03-30	2017-03-31 09:22:00 -04:00
stdenv	stdenv: aarch64: Update bootstrap tarballs	2017-03-15 19:17:52 +02:00
test
tools	Merge pull request #24559 from georgewhewell/mtools-darwin	2017-04-05 00:40:09 +02:00
top-level	Merge pull request #24619 from NeQuissimus/docker_17_03_1	2017-04-04 13:44:29 -05:00