Vladimír Čunát 93f6af1071 Merge branch 'master' into staging		2016-02-25 09:01:48 +01:00
..
applications	nixpkgs: bittorrentSync20 2.3.0 -> 2.3.3	2016-02-24 22:28:16 -06:00
build-support	Merge branch 'master' into staging	2016-02-25 09:01:48 +01:00
data	dosemu-fonts: use versioned name	2016-02-22 19:42:27 +01:00
desktops	Merge branch 'master' into staging	2016-02-25 09:01:48 +01:00
development	Merge branch 'master' into staging	2016-02-25 09:01:48 +01:00
games	hedgewars: 0.9.21 -> 0.9.22, fix build failure	2016-02-24 14:29:35 +01:00
misc	Merge pull request #12532 from bendlas/update-splix	2016-02-24 00:02:28 +00:00
os-specific	Merge branch 'master' into staging	2016-02-25 09:01:48 +01:00
servers	Merge pull request #13125 from abbradar/uwsgi	2016-02-23 22:32:54 +00:00
shells	buildPythonApplication: use new function for Python applications	2016-02-19 13:16:41 +01:00
stdenv	stdenvLinux: Use bash instead of sh from bootstrapTools	2016-02-24 11:01:11 +01:00
test
tools	Merge branch 'master' into staging	2016-02-25 09:01:48 +01:00
top-level	Merge branch 'master' into staging	2016-02-25 09:01:48 +01:00