Vladimír Čunát b4af993c3f Merge branch 'master' into staging ... Conflicts (simple): pkgs/development/lisp-modules/clwrapper/setup-hook.sh		2014-11-14 14:28:23 +01:00
..
applications	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00
build-support	findTarball: Fix the case where src is a directory	2014-11-10 20:06:50 +01:00
data	Fixed many descriptions	2014-11-11 14:36:34 +01:00
desktops	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00
development	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00
games	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00
misc	fix missing sha and rev	2014-11-13 22:43:32 +03:00
os-specific	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00
servers	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00
shells
stdenv	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00
test
tools	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00
top-level	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00