Eelco Dolstra f9b5ed66d1 Inline qt4-clang ... This prevents a potential name/version conflict in nix-env, and a large Hydra build for a proprietary package.		2016-03-27 23:32:15 +02:00
..
applications	Merge pull request #14249 from romildo/fix.awesome	2016-03-27 21:47:49 +03:00
build-support	Merge remote-tracking branch 'origin/staging'	2016-03-27 13:19:04 +01:00
data	mplus: Don't start version with a letter	2016-03-24 13:24:29 +01:00
desktops	kde5.l10n.sr: patch shebangs	2016-03-27 21:44:08 +01:00
development	wxgtk: explicitly link to libX11 and libcairo	2016-03-27 20:53:55 +03:00
games	Merge remote-tracking branch 'origin/staging'	2016-03-27 13:19:04 +01:00
misc	Merge remote-tracking branch 'origin/staging'	2016-03-27 13:19:04 +01:00
os-specific	Merge pull request #14252 from joachifm/lttng-broken	2016-03-27 20:24:16 +01:00
servers	Merge remote-tracking branch 'origin/staging'	2016-03-27 13:19:04 +01:00
shells	oh-my-zsh: 2016-03-19 -> 2016-03-24	2016-03-25 15:07:06 -04:00
stdenv	Merge remote-tracking branch 'origin/staging'	2016-03-27 13:19:04 +01:00
test	Replace references to all-packages.nix, by references to the top-level of nixpkgs repository.	2016-03-13 18:25:52 +00:00
tools	openvpn: 2.3.8 -> 2.3.10	2016-03-27 23:29:53 +02:00
top-level	Inline qt4-clang	2016-03-27 23:32:15 +02:00