Michael Raskin 6bdf8cc015 Merge pull request #24300 from winniequinn/vscode-1.10.2 ... vscode: 1.10.0 -> 1.10.2		2017-03-24 22:42:35 +01:00
..
applications	Merge pull request #24300 from winniequinn/vscode-1.10.2	2017-03-24 22:42:35 +01:00
build-support	Add setupSystemdUnits function.	2017-03-24 15:47:51 -04:00
common-updater	maintainers: Add script to patch version/sha256 in .nix files	2017-02-19 16:51:17 +02:00
data	Merge branch 'master' into staging	2017-03-23 13:31:28 +01:00
desktops	Merge pull request #24133 from abbradar/gtk3-qt	2017-03-24 01:49:41 +03:00
development	pythonPackages.BTrees: fix evaluation; builds fine	2017-03-24 22:01:55 +01:00
games	atanks: remove unnecessary patch phase	2017-03-23 21:52:09 +01:00
misc	Merge branch 'staging'	2017-03-24 21:07:55 +01:00
os-specific	Merge branch 'staging'	2017-03-24 21:07:55 +01:00
servers	mpd: fix i686-linux build	2017-03-23 23:09:41 +01:00
shells	bash: 4.4p5 -> 4.4p12	2017-03-20 16:47:13 +01:00
stdenv	stdenv: aarch64: Update bootstrap tarballs	2017-03-15 19:17:52 +02:00
test
tools	dar: 2.5.3 -> 2.5.9	2017-03-24 16:06:41 -05:00
top-level	Merge branch 'staging'	2017-03-24 21:07:55 +01:00