cillianderoiste d44573e16f Merge pull request #6469 from rushmorem/jshon-package ... Add jshon package		2015-02-22 14:10:08 +01:00
..
applications	Merge pull request #6480 from jagajaga/fix_names	2015-02-22 14:05:07 +01:00
build-support	autonix: tweak manifest format	2015-02-21 11:39:18 -06:00
data	add media-player-info	2015-02-21 11:39:19 -06:00
desktops	update various packages to use Qt 5.4	2015-02-21 11:39:20 -06:00
development	Merge pull request #6469 from rushmorem/jshon-package	2015-02-22 14:10:08 +01:00
games	tibia: update to 10.75	2015-02-14 08:52:47 +00:00
misc	hplip: update to 3.15.2	2015-02-21 20:19:21 -06:00
os-specific	nvidia_x11: reintroduce libXv for nvidia-settings	2015-02-21 17:28:02 +01:00
servers	Merge pull request #6489 from benley/mesos-dns	2015-02-22 00:26:20 +03:00
shells	Fish wants libiconv too, even though it won't admit it	2015-02-18 01:14:36 -05:00
stdenv	Bootstrap tools for the upcoming new darwin stdenv (not working yet in this stdenv, but will soon)	2015-02-18 00:24:34 -05:00
test	Merge recent master into staging	2014-09-13 21:48:29 +02:00
tools	Merge pull request #6461 from henrytill/hsetroot	2015-02-22 14:06:47 +01:00
top-level	Merge pull request #6469 from rushmorem/jshon-package	2015-02-22 14:10:08 +01:00