Peter Hoeg 3729441340 Merge branch 'u/bundler' into real_master		2017-02-18 17:35:07 +08:00
..
applications	Merge pull request #22933 from peterhoeg/u/cal	2017-02-18 16:58:14 +08:00
build-support	nix-prefetch-zip: Remove	2017-02-16 11:28:23 +01:00
data	hackage: update snapshot to 2017-02-12T15:49:03Z	2017-02-16 11:48:10 +01:00
desktops	Merge branch 'staging'	2017-02-18 08:59:29 +01:00
development	Merge branch 'u/bundler' into real_master	2017-02-18 17:35:07 +08:00
games	scummvm: 1.8.0 -> 1.9.0	2017-02-17 23:46:53 +01:00
misc	ghostscript: fix installed library name on darwin	2017-02-16 13:32:39 -05:00
os-specific	Merge branch 'staging'	2017-02-18 08:59:29 +01:00
servers	Merge branch 'staging'	2017-02-18 08:59:29 +01:00
shells	elvish: 0.1 -> 0.5	2017-02-12 21:37:53 +01:00
stdenv	Merge pull request #22387 from Ericson2314/cross-3-platforms	2017-02-05 17:41:31 -05:00
test
tools	Merge branch 'staging'	2017-02-18 08:59:29 +01:00
top-level	Merge branch 'staging'	2017-02-18 08:59:29 +01:00