Frederik Rietdijk e67b979ab5 Merge remote-tracking branch 'upstream/master' into HEAD		2017-03-18 15:32:43 +01:00
..
applications	Merge remote-tracking branch 'upstream/master' into HEAD	2017-03-18 15:32:43 +01:00
build-support	makeWrapper: quote paths	2017-03-16 15:16:33 +01:00
common-updater	maintainers: Add script to patch version/sha256 in .nix files	2017-02-19 16:51:17 +02:00
data	hasklig: 0.9 -> 1.1	2017-03-05 15:32:30 +01:00
desktops	Merge branch 'master' into staging	2017-03-18 11:00:31 +01:00
development	Merge remote-tracking branch 'upstream/master' into HEAD	2017-03-18 15:32:43 +01:00
games	sgt-puzzles: 20161228.7cae89f -> 20170228.1f613ba	2017-03-09 18:47:37 +01:00
misc	Merge remote-tracking branch 'upstream/master' into staging	2017-03-14 00:49:22 +02:00
os-specific	Merge branch 'master' into staging	2017-03-18 11:00:31 +01:00
servers	Merge pull request #23991 from NickHu/tvheadend	2017-03-18 10:25:46 +01:00
shells	Merge pull request #23875 from NeQuissimus/oh-my-zsh_2017-02-27	2017-03-13 20:07:59 -04:00
stdenv	stdenv: aarch64: Update bootstrap tarballs	2017-03-15 19:17:52 +02:00
test
tools	Merge remote-tracking branch 'upstream/master' into HEAD	2017-03-18 15:32:43 +01:00
top-level	Merge remote-tracking branch 'upstream/master' into HEAD	2017-03-18 15:32:43 +01:00