Shea Levy 19cd9f16a0 Merge branch 'staging'		2015-03-20 09:53:34 -04:00
..
applications	Merge branch 'staging'	2015-03-20 09:53:34 -04:00
build-support	Merge branch 'master' into staging	2015-03-17 13:35:05 +01:00
data	Merge #6472: add ddccontrol	2015-03-16 21:52:59 +01:00
desktops	Patch gnome-control-center not to override VPN plugin paths.	2015-03-16 13:21:23 +01:00
development	Merge branch 'staging'	2015-03-20 09:53:34 -04:00
games	flightgear: bump version to 3.4 (close #6385)	2015-03-17 22:58:39 +01:00
misc	vim-plugins: wakatime 3.0.7 -> 3.0.8	2015-03-10 04:58:45 +01:00
os-specific	Merge branch 'staging'	2015-03-20 09:53:34 -04:00
servers	Merge pull request #6611 from jagajaga/slurm	2015-03-19 21:06:49 +03:00
shells	fish: 2.1.1 -> 2.1.2	2015-03-05 01:55:45 +01:00
stdenv	Fix eval-release.nix evaluation	2015-03-06 15:09:51 +01:00
test
tools	Merge branch 'staging'	2015-03-20 09:53:34 -04:00
top-level	Merge branch 'staging'	2015-03-20 09:53:34 -04:00