Michael Raskin 24f35daa60 Merge pull request #23726 from sternenseemann/master ... redo-sh: init at 1.2.6		2017-03-18 19:19:51 +01:00
..
applications	Merge pull request #23722 from joachifm/surf-webkit2	2017-03-18 19:18:35 +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 pull request #23726 from sternenseemann/master	2017-03-18 19:19:51 +01:00
games	Merge pull request #23161 from AndersonTorres/freecell-solver	2017-03-18 17:24:15 +01:00
misc	Merge pull request #23256 from edanaher/ensime	2017-03-18 18:24:19 +01:00
os-specific	Merge pull request #23689 from sh01/hwdata_hashaddr	2017-03-18 19:16:27 +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 pull request #23715 from risicle/moz-sops	2017-03-18 19:18:06 +01:00
top-level	Merge pull request #23726 from sternenseemann/master	2017-03-18 19:19:51 +01:00